@corva/create-app 0.33.0-1 → 0.33.0-rc.1

package/README.md

@@ -42,27 +42,28 @@ Arguments:
   project-directory               project directory to work with (default: "Current working dir")
 
 Options:
-  --developerName [string]        Enter the Developer Name (default: "O&G Company")
-  --developerIdentifier [string]  Enter the Developer Identifier (default: "oandgc")
+  --appKey [string]               Enter the App Key (default: "app.key-goes-here")
+  --appName [string]              Enter the App Name
   --appType [string]              Choose the App Type (choices: "ui", "scheduler", "stream", "task", default: "ui")
-  --schedulerType [number]        Choose the scheduler type (choices: "1", "2", "4", default: 1)
+  --bump-version <string>         DEPRECATED Use with zip or release command instead (choices: "major", "minor", "patch", "skip")
+  --category [string]             Enter category (default: "")
   --cronString [string]           Provide CRON string for the scheduler (default: "*/5 * * * *")
   --depthMilestone [number]       Provide depth milestone for the scheduler (default: 1)
-  --appKey [string]               Enter the App Key (default: "app.key-goes-here")
-  --appName [string]              Enter the App Name
   --description [string]          Enter description (default: "This is the description of my app. You can do great things with it!")
+  --developerIdentifier [string]  Enter the Developer Identifier (default: "oandgc")
+  --developerName [string]        Enter the Developer Name (default: "O&G Company")
+  --ignored-files                 File patters to skip zip
+  --release                       DEPRECATED Use release command instead
+  --runtime [string]              Choose runtime (choices: "ui", "nodejs12.x", "nodejs14.x", "python3.8")
+  --schedulerType [number]        Choose the scheduler type (choices: "1", "2", "4", default: 1)
+  --segments [string]             Choose segments (choices: "drilling", "completion")
   --summary [string]              Enter summary (default: "More information about this app goes here")
-  --category [string]             Enter category (default: "")
   --website [string]              Enter website (default: "https://www.oandgexample.com/my-app/")
-  --segments [string]             Choose segments (choices: "drilling", "completion")
-  --runtime [string]              Choose runtime (choices: "ui", "nodejs12.x", "nodejs14.x", "python3.8")
+  -V, --version                   output the version number
+  -h, --help                      display help for command
   -p, --packageManager [string]   Please select the desired package manager (choices: "yarn", "npm", default: "yarn")
   -t, --useTypescript [boolean]   Would you like to use TypesScript? (default: false)
-  -V, --version                   output the version number
   -z, --zip [string]              DEPRECATED Use zip command instead
-  --release                       DEPRECATED Use release command instead
-  --bump-version <string>         DEPRECATED Use with zip or release command instead (choices: "major", "minor", "patch", "skip")
-  -h, --help                      display help for command
 ```
 
 ### Examples
@@ -134,6 +135,7 @@ For apps that written in `python`:
 - all `*.py` files
 
 If you want to zip some files that are not included pass that as `patterns` arguments.
+To skip some files from zipping please use `--ignored-files` option.
 
 ### Examples
 

package/lib/constants/package.js

@@ -15,11 +15,11 @@ const uiDependencies = {
   'prop-types': '^15.6.1',
   'react': '17.0.1',
   'react-dom': '17.0.1',
-}
+};
 
 const jsUiDevDependencies = {
   'postcss-loader': '4.1.0',
-}
+};
 
 const tsUiDevDependencies = {
   ...jsUiDevDependencies,
@@ -30,7 +30,7 @@ const tsUiDevDependencies = {
   '@typescript-eslint/eslint-plugin': '^4.31.2',
   '@typescript-eslint/parser': '^4.31.2',
   'ts-loader': '8.2.0',
-  'typescript': '^4.4.3',
+  'typescript': '4.6.3',
 };
 
 const uiScripts = {
@@ -46,49 +46,49 @@ const uiPackage = {
   main: 'src/index.js',
   scripts: uiScripts,
   dependencies: uiDependencies,
-  devDependencies: jsUiDevDependencies
-}
+  devDependencies: jsUiDevDependencies,
+};
 
 const tsUiPackage = {
   ...uiPackage,
-  devDependencies: tsUiDevDependencies
-}
+  devDependencies: tsUiDevDependencies,
+};
 
 const nodeNpmScripts = {
-  "bundle": "create-corva-app zip .",
-  "test": "npm audit --production && npm run unit",
-  "unit": "jest --passWithNoTests"
+  bundle: 'create-corva-app zip .',
+  test: 'npm audit --production && npm run unit',
+  unit: 'jest --passWithNoTests',
 };
 
 const nodeDependencies = {
-  "@corva/node-sdk": "^6.2.0"
-}
+  '@corva/node-sdk': '^6.2.0',
+};
 
 const nodeDevDependencies = {
-  "jest": "^27.5.1"
-}
+  jest: '^27.5.1',
+};
 
 const nodeTsDevDependencies = {
-  "@types/jest": "^27.4.1",
-  "jest": "^27.5.1",
-  "ts-jest": "^27.1.4",
-  "typescript": "^4.6.3"
-}
+  '@types/jest': '^27.4.1',
+  'jest': '^27.5.1',
+  'ts-jest': '^27.1.4',
+  'typescript': '^4.6.3',
+};
 
 const nodeYarnScripts = {
   ...nodeNpmScripts,
-  "test": "yarn audit --groups dependencies && yarn unit",
-}
+  test: 'yarn audit --groups dependencies && yarn unit',
+};
 
 const nodeTsScripts = {
   ...nodeNpmScripts,
-  "build": "tsc -p tsconfig.build.json",
-}
+  build: 'tsc -p tsconfig.build.json',
+};
 
 const nodeTsYarnScripts = {
   ...nodeYarnScripts,
-  "build": "tsc -p tsconfig.build.json",
-}
+  build: 'tsc -p tsconfig.build.json',
+};
 
 const nodeNpmPackage = {
   version: '0.0.1',
@@ -96,24 +96,24 @@ const nodeNpmPackage = {
   private: true,
   dependencies: nodeDependencies,
   devDependencies: nodeDevDependencies,
-  scripts: nodeNpmScripts
-}
+  scripts: nodeNpmScripts,
+};
 
 const nodeYarnPackage = {
   ...nodeNpmPackage,
-  scripts: nodeYarnScripts
-}
+  scripts: nodeYarnScripts,
+};
 
 const nodeTsNpmPackage = {
   ...nodeNpmPackage,
   devDependencies: nodeTsDevDependencies,
-  scripts: nodeTsScripts
-}
+  scripts: nodeTsScripts,
+};
 
 const nodeTsYarnPackage = {
   ...nodeTsNpmPackage,
-  scripts: nodeTsYarnScripts
-}
+  scripts: nodeTsYarnScripts,
+};
 
 const extendWithTsConfig = (package, version) => {
   package.devDependencies = {
@@ -122,7 +122,7 @@ const extendWithTsConfig = (package, version) => {
   };
 
   return package;
-}
+};
 
 const defaults = {
   javascript: {
@@ -130,13 +130,13 @@ const defaults = {
       ui: () => uiPackage,
       task: () => nodeYarnPackage,
       scheduler: () => nodeYarnPackage,
-      stream: () => nodeYarnPackage
+      stream: () => nodeYarnPackage,
     },
     npm: {
       ui: () => uiPackage,
       task: () => nodeNpmPackage,
       scheduler: () => nodeNpmPackage,
-      stream: () => nodeNpmPackage
+      stream: () => nodeNpmPackage,
     },
   },
   typescript: {
@@ -144,19 +144,19 @@ const defaults = {
       ui: () => tsUiPackage,
       task: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
       scheduler: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
-      stream: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version)
+      stream: ({ version }) => extendWithTsConfig(nodeTsYarnPackage, version),
     },
     npm: {
       ui: () => tsUiPackage,
       task: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
       scheduler: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
-      stream: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version)
-    }
-  }
+      stream: ({ version }) => extendWithTsConfig(nodeTsNpmPackage, version),
+    },
+  },
 };
 
 module.exports = {
   getDefaultsForPackageJson: (manifest, runtime) => {
     return defaults[runtime.language][runtime.packageManager][manifest.type](runtime);
-  }
-}
+  },
+};

package/lib/flows/steps/zip-file-list-resolve.js

@@ -17,8 +17,8 @@ const uniqueValues = (array) => Array.from(new Set(array));
 const FILE_LIST_RESOLVE_STEP = {
   message: 'Resolving files list...',
   fn: async (context) => {
-    const { patterns, manifest, dirName } = context;
-    const files = await transformPatternsIntoFileNames(dirName, patterns);
+    const { patterns, manifest, dirName, options } = context;
+    const files = await transformPatternsIntoFileNames(dirName, patterns, options.ignoredFiles);
 
     if (manifest.isUi()) {
       return resolveDataToZipUiApp(files, context);
@@ -36,7 +36,7 @@ const FILE_LIST_RESOLVE_STEP = {
   },
 };
 
-const transformPatternsIntoFileNames = async (dirName, patterns) => {
+const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles = []) => {
   const filesFromPatterns = [];
 
   for (const pattern of patterns) {
@@ -52,7 +52,10 @@ const transformPatternsIntoFileNames = async (dirName, patterns) => {
       continue;
     }
 
-    const files = await glob(pattern, { cwd: dirName, ignore: '**/node_modules' });
+    const files = await glob(pattern, {
+      cwd: dirName,
+      ignore: ['**/node_modules', ...ignoredFiles],
+    });
 
     filesFromPatterns.push(...files);
   }
@@ -99,7 +102,7 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName })
     '.nvmrc',
     'yarn.lock',
     { path: resolve(dirName, 'packageForSource.json'), name: 'package.json' },
-    'src'
+    ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles))
   );
 
   return {
@@ -152,10 +155,16 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
     itemsToZip.push('tsconfig.json', 'tsconfig.build.json');
 
     if (shouldPushDefaultSrc) {
-      itemsToZip.push('index.ts', ...(await glob('+(src|lib)/**/*.ts', { cwd: dirName })));
+      itemsToZip.push(
+        'index.ts',
+        ...(await glob('+(src|lib)/**/*.ts', { cwd: dirName, ignore: options.ignoredFiles }))
+      );
     }
   } else if (shouldPushDefaultSrc) {
-    itemsToZip.push('index.js', ...(await glob('+(src|lib)/**/*.js', { cwd: dirName })));
+    itemsToZip.push(
+      'index.js',
+      ...(await glob('+(src|lib)/**/*.js', { cwd: dirName, ignore: options.ignoredFiles }))
+    );
   }
 
   return {
@@ -166,11 +175,11 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
   };
 };
 
-const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName }) => {
+const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName, options }) => {
   const zipFileName = `${manifest.manifest.application.name}.zip`;
 
   if (!itemsToZip.length) {
-    itemsToZip.push(...(await glob('**/*.py', { cwd: dirName })));
+    itemsToZip.push(...(await glob('**/*.py', { cwd: dirName, ignore: options.ignoredFiles })));
   }
 
   itemsToZip.push('manifest.json', 'requirements.txt');

package/lib/index.js

@@ -178,6 +178,7 @@ async function initialChecks() {
     .argument('<project-directory>', 'Project directory to work with')
     .argument('[patterns...]', 'Additional patterns to zip', [])
     .addOption(bumpVersionOption)
+    .addOption(new Option('--ignored-files [ignoredFiles...]', 'Patterns to skip zip', []))
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 
@@ -190,6 +191,7 @@ async function initialChecks() {
     .argument('<project-directory>', 'Project directory to work with')
     .argument('[patterns...]', 'Additional patterns to zip', [])
     .addOption(bumpVersionOption)
+    .addOption(new Option('--ignored-files [ignoredFiles...]', 'Patterns to skip zip', []))
     .action(async (dirName, patterns, options) => {
       options.bumpVersion = await ensureBumpVersion(options.bumpVersion);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.33.0-1",
+    "version": "0.33.0-rc.1",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [