Merge branch 'main' into fix/tizen_app_package

* main: (35 commits) add ts-coverage tool update json schema, fix config loading any killing spree type coverage, kill any types for program, workspaces, runtimes typefy context cli strong type for c.program kill any rename RenativeConfigFile to ConfigFileBuildConfig add runtime config schema, cleanup npm types fixes typed npm package files clean code fix/buildHooks_path context type hardening typed project template typed plugin templates finish config file type migration more ts fixes ts fixes ... # Conflicts: # packages/template-starter/package.json
flexn-io · Oct 20, 2023 · 4658af9 · 4658af9
2 parents 4deca94 + 19e6dd6
commit 4658af9
Show file tree

Hide file tree

Showing 105 changed files with 1,719 additions and 912 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,5 @@ lib
 
 lerna-debug.log
 yarn-error.log
-.rnv
+.rnv
+coverage-ts
diff --git a/package.json b/package.json
@@ -59,7 +59,9 @@
         "bootstrap": "yarn run link:rnv && npx lerna bootstrap && yarn build",
         "bootstrap-clean": "rm -rf ./node_modules; npx lerna clean --yes && yarn bootstrap",
         "build": "lerna run build",
-        "circular": "npx madge --circular --extensions ts --exclude '\\.(d.ts)$' ./packages",
+        "report-circular": "npx madge --circular --extensions ts --exclude '\\.(d.ts)$' ./packages",
+        "report-ts-coverage": "typescript-coverage-report -p ./packages/core/tsconfig.json  -t 99 -i lib",
+        "report-jest": "jest --coverage",
         "compile": "npx lerna run compile",
         "deploy:canary": "yarn pre-publish && npx lerna publish from-package --dist-tag canary && git push origin HEAD",
         "deploy:feat": "yarn pre-publish && npx lerna publish from-package --dist-tag feat && git push origin HEAD",
@@ -79,7 +81,6 @@
         "prettier-write-json": "npx prettier '**/{package.json,renative.plugins.json,renative.json}' --write --config .prettierrc.js",
         "sanity": "yarn compile && yarn lint && yarn test",
         "test": "jest",
-        "test-cover": "jest --coverage",
         "watch": "npx lerna exec yarn watch --parallel",
         "watch-alt": "npx lerna run compile & npx lerna watch -- lerna run compile"
     },
@@ -116,8 +117,8 @@
         "madge": "6.1.0",
         "prettier": "2.3.1",
         "ts-jest": "^27.0.7",
-        "ttab": "^0.7.2",
-        "typescript": "5.2.2"
+        "typescript": "5.2.2",
+        "typescript-coverage-report": "0.8.0"
     },
     "engines": {
         "node": ">=18.0.0",

diff --git a/packages/build-hooks-git/src/git.ts b/packages/build-hooks-git/src/git.ts
@@ -1,10 +1,15 @@
-import { RnvContext, logHook } from '@rnv/core';
+import { RnvContext, logError, logHook } from '@rnv/core';
 import path from 'path';
 import simpleGit from 'simple-git';
 
 export const gitCommit = async (c: RnvContext) => {
     const v = c.files.project?.package?.version;
 
+    if (!v) {
+        logError('Version not found in package.json. cannot perform git commit');
+        return;
+    }
+
     const baseDir = path.join(c.paths.project.dir);
     logHook(`gitCommitAndTagVersion v${v}`);
     const git = simpleGit({ baseDir });
@@ -18,6 +23,11 @@ export const gitCommit = async (c: RnvContext) => {
 export const gitTag = async (c: RnvContext) => {
     const v = c.files.project.package.version;
 
+    if (!v) {
+        logError('Version not found in package.json. cannot perform git tag');
+        return;
+    }
+
     const baseDir = path.join(c.paths.project.dir);
     logHook(`gitTagAndPush v${v}`);
     const git = simpleGit({ baseDir });

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -16,7 +16,7 @@ export const run = () => {
 
     program.version(packageJson.version, '-v, --version', 'output current version');
 
-    PARAMS.withAll().forEach((param: any) => {
+    PARAMS.withAll().forEach((param) => {
         let cmd = '';
         if (param.shortcut) {
             cmd += `-${param.shortcut}, `;
@@ -34,7 +34,7 @@ export const run = () => {
         program.option(cmd, param.description);
     });
 
-    program.arguments('<cmd> [option]').action((cmd: any, option: any) => {
+    program.arguments('<cmd> [option]').action((cmd, option) => {
         cmdValue = cmd;
         cmdOption = option;
     });
@@ -43,5 +43,5 @@ export const run = () => {
 
     executeRnv({ cmd: cmdValue, subCmd: cmdOption, program, process, spinner: Spinner, prompt: Prompt, logger: Logger })
         .then(() => logComplete(!getContext().runtime.keepSessionActive))
-        .catch((e: any) => logError(e, true));
+        .catch((e: unknown) => logError(e, true));
 };
diff --git a/packages/cli/src/logger/index.ts b/packages/cli/src/logger/index.ts
@@ -8,18 +8,19 @@ import {
     generateDefaultChalk,
     RnvApiLogger,
     RnvApiChalk,
+    RnvApiChalkFn,
 } from '@rnv/core';
 
 const ICN_ROCKET = isSystemWin ? 'RNV' : '🚀';
 const ICN_UNICORN = isSystemWin ? 'unicorn' : '🦄';
 const _chalkCols = generateDefaultChalk();
-const _chalkMono: any = {
+const _chalkMono = {
     ..._chalkCols,
 };
 let currentChalk: RnvApiChalk = _chalk;
 let RNV = 'ReNative';
 const PRIVATE_PARAMS = ['-k', '--key'];
-let _currentProcess: any;
+let _currentProcess: NodeJS.Process;
 let _isInfoEnabled = false;
 let _infoFilter: Array<string> = [];
 // let _c: RnvContext;
@@ -262,9 +263,9 @@ export const logSummary = (header = 'SUMMARY') => {
     }
 
     if (ctx.files?.project?.config?.defaults) {
-        const defaultProjectConfigs = ctx.files.project.config.defaults;
-        if (defaultProjectConfigs?.template) {
-            str += printIntoBox(`Master Template: ${_highlightColor(defaultProjectConfigs.template)}`);
+        const currentTemplate = ctx.files.project.config?.currentTemplate;
+        if (currentTemplate) {
+            str += printIntoBox(`Master Template: ${_highlightColor(currentTemplate)}`);
         }
     }
 
@@ -323,7 +324,7 @@ const _sanitizePaths = (msg: string) => {
 
 const TASK_COUNTER: Record<string, number> = {};
 
-export const logTask = (task: string, customChalk?: any) => {
+export const logTask = (task: string, customChalk?: string | RnvApiChalkFn) => {
     if (!TASK_COUNTER[task]) TASK_COUNTER[task] = 0;
     TASK_COUNTER[task] += 1;
     const taskCount = currentChalk.grey(`[${TASK_COUNTER[task]}]`);
@@ -374,7 +375,7 @@ type PrintJsonPayload = {
     type: string;
     task?: string;
     message: string;
-    hook?: any;
+    hook?: string;
     level?: string;
 };
 
@@ -411,7 +412,7 @@ export const logHook = (hook = '', msg = '') => {
     );
 };
 
-export const logWarning = (msg: string | boolean) => {
+export const logWarning = (msg: string | boolean | unknown) => {
     const msgSn = typeof msg === 'string' ? _sanitizePaths(msg) : String(msg);
     if (_jsonOnly) {
         return _printJson({
@@ -477,7 +478,13 @@ export const logSuccess = (msg: string) => {
     logAndSave(currentChalk.magenta(`[ success ]${_getCurrentTask()} ${_sanitizePaths(msg)}`));
 };
 
-export const logError = (e: Error | string, isEnd = false, skipAnalytics = false) => {
+export const logError = (e: Error | string | unknown, isEnd = false, skipAnalytics = false) => {
+    let err = '';
+    if (typeof e === 'string') {
+        err = e;
+    } else if (e instanceof Error) {
+        err = e.message;
+    }
     const ctx = getContext();
     const api = getApi();
     if (!skipAnalytics) {
@@ -491,15 +498,15 @@ export const logError = (e: Error | string, isEnd = false, skipAnalytics = false
             arch: ctx.process?.arch,
             node: ctx.process?.versions?.node,
         };
-        api.analytics.captureException(e, { extra });
+        api.analytics.captureException(err, { extra });
     }
 
     if (_jsonOnly) {
         _printJson({
             type: 'log',
             level: 'error',
             task: stripAnsi(_getCurrentTask()),
-            message: stripAnsi(_sanitizePaths(e instanceof Error ? e.message : e)),
+            message: stripAnsi(_sanitizePaths(err)),
         });
     } else if (e && e instanceof Error && e.message) {
         logAndSave(currentChalk.red(`[ error ]${_getCurrentTask()} ${e.message}\n${e.stack}`), isEnd);

diff --git a/packages/core/jsonSchema/rnv.app.json b/packages/core/jsonSchema/rnv.app.json
@@ -471,17 +471,11 @@
                   "type": "boolean"
                 },
                 "storeFile": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  },
+                  "type": "string",
                   "description": "Name of the store file in android project"
                 },
                 "keyAlias": {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  },
+                  "type": "string",
                   "description": "Key alias of the store file in android project"
                 },
                 "templateAndroid": {

diff --git a/packages/core/jsonSchema/rnv.global.json b/packages/core/jsonSchema/rnv.global.json
@@ -40,11 +40,26 @@
           },
           "description": "Define your sdk configurations"
         },
+        "projectTemplates": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object",
+            "properties": {},
+            "additionalProperties": false
+          }
+        },
+        "appConfigsPath": {
+          "type": "string",
+          "description": "Enables you to define custom global appConfigs location that every project will automatically use"
+        },
         "$schema": {
           "type": "string",
           "description": "schema definition"
         }
       },
+      "required": [
+        "projectTemplates"
+      ],
       "additionalProperties": false
     }
   },

diff --git a/packages/core/jsonSchema/rnv.local.json b/packages/core/jsonSchema/rnv.local.json
@@ -49,9 +49,6 @@
           },
           "additionalProperties": false
         },
-        "extend": {
-          "type": "string"
-        },
         "$schema": {
           "type": "string",
           "description": "schema definition"

diff --git a/packages/core/jsonSchema/rnv.private.json b/packages/core/jsonSchema/rnv.private.json
@@ -4,28 +4,97 @@
     "rnv.private": {
       "type": "object",
       "properties": {
-        "storePassword": {
-          "type": "string",
-          "description": "> WARNING. this prop is sensitive and should not be stored in standard `renative.json` configs. use `renative.private.json` files instead!\n\nstorePassword for keystore file"
-        },
-        "keyPassword": {
-          "type": "string",
-          "description": "> WARNING. this prop is sensitive and should not be stored in standard `renative.json` configs. use `renative.private.json` files instead!\n\nkeyPassword for keystore file"
-        },
         "private": {
           "type": "object",
           "additionalProperties": {},
           "description": "Special object which contains private info. this object should be used only in `renative.private.json` files and never commited to your repository. Private files usually reside in your workspace and are subject to crypto encryption if enabled. RNV will warn you if it finds private key in your regular `renative.json` file"
         },
+        "platforms": {
+          "type": "object",
+          "properties": {
+            "android": {
+              "type": "object",
+              "properties": {
+                "storePassword": {
+                  "type": "string",
+                  "description": "> WARNING. this prop is sensitive and should not be stored in standard `renative.json` configs. use `renative.private.json` files instead!\n\nstorePassword for keystore file"
+                },
+                "keyPassword": {
+                  "type": "string",
+                  "description": "> WARNING. this prop is sensitive and should not be stored in standard `renative.json` configs. use `renative.private.json` files instead!\n\nkeyPassword for keystore file"
+                },
+                "storeFile": {
+                  "type": "string",
+                  "description": "Name of the store file in android project"
+                },
+                "keyAlias": {
+                  "type": "string",
+                  "description": "Key alias of the store file in android project"
+                }
+              },
+              "additionalProperties": false
+            },
+            "androidtv": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/android"
+            },
+            "androidwear": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/android"
+            },
+            "firetv": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/android"
+            },
+            "ios": {
+              "type": "object",
+              "properties": {},
+              "additionalProperties": false
+            },
+            "tvos": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "tizen": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "tizenmobile": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "tizenwatch": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "webos": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "web": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "webtv": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "chromecast": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "kaios": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "macos": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "linux": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "windows": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            },
+            "xbox": {
+              "$ref": "#/definitions/rnv.private/properties/platforms/properties/ios"
+            }
+          },
+          "additionalProperties": false
+        },
         "$schema": {
           "type": "string",
           "description": "schema definition"
         }
       },
-      "required": [
-        "storePassword",
-        "keyPassword"
-      ],
       "additionalProperties": false
     }
   },