lincd-cli 0.2.36 → 0.2.38

package/defaults/app-with-backend/gitignore.template

@@ -0,0 +1,22 @@
+node_modules
+frontend/build
+frontend/web/assets
+data/uploads
+data/metadata
+data/sessions
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+packages/**/dist
+packages/**/lib
+packages/**/.yarn/*
+!packages/**/.yarn/patches
+!packages/**/.yarn/plugins
+!packages/**/.yarn/releases
+!packages/**/.yarn/sdks
+!packages/**/.yarn/versions
+android/app/build
+ios/App/App/public

package/defaults/app-with-backend/yarnrc.yml.template

@@ -0,0 +1,8 @@
+nodeLinker: "node-modules"
+npmRegistryServer: "https://registry.npmjs.org/"
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
+    spec: "@yarnpkg/plugin-version"
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

package/lib/cli-methods.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.buildMetadata = exports.register = exports.createPackage = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.buildMetadata = exports.register = exports.createPackage = exports.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
@@ -47,6 +47,7 @@ const JSONLDWriter_1 = require("lincd-jsonld/lib/utils/JSONLDWriter");
 const NameSpace_1 = require("lincd/lib/utils/NameSpace");
 const Prefix_1 = require("lincd/lib/utils/Prefix");
 const get_env_vars_1 = require("env-cmd/dist/get-env-vars");
+const depcheck_1 = __importDefault(require("depcheck"));
 var glob = require('glob');
 var variables = {};
 var open = require('open');
@@ -63,7 +64,8 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-with-backend'), targetFolder);
     //make sure the data folder exists (even though its empty).. copying empty folders does not work with fs.copySync
     fs_extra_1.default.mkdirSync(path_1.default.join(targetFolder, 'data'), { recursive: true });
-    // fs.renameSync(path.join(targetFolder, '.yarnrc.yml.template'), path.join(targetFolder, '.yarnrc.yml'));
+    fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'gitignore.template'), path_1.default.join(targetFolder, '.gitignore'));
+    fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'yarnrc.yml.template'), path_1.default.join(targetFolder, '.yarnrc.yml'));
     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
     log("Creating new LINCD application '" + name + "'");
     //replace variables in some copied files
@@ -234,8 +236,12 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
         });
         if (stack.length <= 0 && done.size < lincdPackages.size) {
             console.log(chalk_1.default.red('Only ' + done.size + ' out of ' + lincdPackages.size + ' packages have been built'));
-            console.log('ALL remaining packages have dependencies that have not been met. This may point to ' + chalk_1.default.red('circular dependencies.'));
-            console.log('Already built: ' + Array.from(done).map(p => chalk_1.default.green(p.packageName)).join(', '));
+            console.log('ALL remaining packages have dependencies that have not been met. This may point to ' +
+                chalk_1.default.red('circular dependencies.'));
+            console.log('Already built: ' +
+                Array.from(done)
+                    .map((p) => chalk_1.default.green(p.packageName))
+                    .join(', '));
             console.log(chalk_1.default.blue('\nTo solve this issue') + ': find the circular dependencies below and fix the dependencies:\n\n');
             //TODO: actually find and name the packages that have circular dependencies
             // let circular = [];
@@ -253,15 +259,20 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
             //     process.exit();
             //   }
             // });
-            lincdPackages.forEach(pkg => {
+            lincdPackages.forEach((pkg) => {
                 let deps = dependencies.get(pkg);
                 if (!done.has(pkg)) {
-                    console.log(chalk_1.default.red(pkg.packageName) + ' has not been built yet. Unbuilt dependencies:\n' + deps.filter(dependency => {
-                        return !Array.from(done).some(p => {
-                            // console.log(p.packageName,dependency.packageName,p===dependency)
-                            return p === dependency;
-                        });
-                    }).map(p => chalk_1.default.red('\t- ' + ((p === null || p === void 0 ? void 0 : p.packageName) ? p.packageName : p.toString()) + '\n')).join(" "));
+                    console.log(chalk_1.default.red(pkg.packageName) +
+                        ' has not been built yet. Unbuilt dependencies:\n' +
+                        deps
+                            .filter((dependency) => {
+                            return !Array.from(done).some((p) => {
+                                // console.log(p.packageName,dependency.packageName,p===dependency)
+                                return p === dependency;
+                            });
+                        })
+                            .map((p) => chalk_1.default.red('\t- ' + ((p === null || p === void 0 ? void 0 : p.packageName) ? p.packageName : p.toString()) + '\n'))
+                            .join(' '));
                     // console.log(chalk.red(pkg.packageName)+' has not been built yet. Built dependencies:\n' + deps.filter(dependency => {
                     //   return Array.from(done).some(p => p.packageName === pkg.packageName)
                     // }).map(p => chalk.green('\t- '+p.packageName+'\n')).join(" "))
@@ -281,19 +292,19 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
     runStack(startStack);
 }
 function hasDependency(pkg, childPkg, dependencies, depth = 1) {
-    console.log("Does " + pkg.packageName + " have dep " + childPkg.packageName + " ?");
+    console.log('Does ' + pkg.packageName + ' have dep ' + childPkg.packageName + ' ?');
     let deps = dependencies.get(pkg);
-    if (deps.some(dependency => {
+    if (deps.some((dependency) => {
         console.log(dependency.packageName, childPkg.packageName, dependency === childPkg);
         if (depth === 2)
             return false;
         // return dependency === childPkg;
         return dependency === childPkg || hasDependency(dependency, childPkg, dependencies, depth++);
     })) {
-        console.log("##YES");
+        console.log('##YES');
         return true;
     }
-    console.log("going up");
+    console.log('going up');
     return false;
 }
 function buildAll(target, target2, target3) {
@@ -352,7 +363,11 @@ function buildAll(target, target2, target3) {
             }
             //unless told otherwise, build the package
             if (!command) {
-                command = (0, utils_1.execPromise)('cd ' + pkg.path + ' && yarn exec lincd build' + (target ? ' ' + target : '') + (target2 ? ' ' + target2 : ''), false, false, {}, false);
+                command = (0, utils_1.execPromise)('cd ' +
+                    pkg.path +
+                    ' && yarn exec lincd build' +
+                    (target ? ' ' + target : '') +
+                    (target2 ? ' ' + target2 : ''), false, false, {}, false);
                 debugInfo(chalk_1.default.cyan('Building ' + pkg.packageName));
             }
             return command
@@ -486,8 +501,8 @@ function setVariable(name, replacement) {
     variables[name] = replacement;
 }
 var replaceVariablesInFile = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
-    var fileContent = yield fs_extra_1.default.readFile(filePath, 'utf8').catch(err => {
-        console.warn(chalk_1.default.red("Could not read file " + filePath));
+    var fileContent = yield fs_extra_1.default.readFile(filePath, 'utf8').catch((err) => {
+        console.warn(chalk_1.default.red('Could not read file ' + filePath));
     });
     if (fileContent) {
         var newContent = replaceCurlyVariables(fileContent);
@@ -706,6 +721,28 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
     }
 });
 exports.createComponent = createComponent;
+const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, depcheck_1.default)(process.cwd(), {}, (results) => {
+        if (results.missing) {
+            let missing = Object.keys(results.missing);
+            //currently react is not an explicit dependency, but we should add it as a peer dependency
+            missing.splice(missing.indexOf('react'));
+            if (missing.length > 0) {
+                console.warn(chalk_1.default.red('Missing dependencies:\n\t' + missing.join(',\n\t')));
+            }
+        }
+        // if(Object.keys(results.invalidFiles).length > 0) {
+        //   console.warn(chalk.red("Invalid files:\n")+Object.keys(results.invalidFiles).join(",\n"));
+        // }
+        // if(Object.keys(results.invalidDirs).length > 0) {
+        //   console.warn(chalk.red("Invalid dirs:\n")+results.invalidDirs.toString());
+        // }
+        // if(results.unused) {
+        //   console.warn("Unused dependencies: "+results.missing.join(", "));
+        // }
+    });
+});
+exports.depCheck = depCheck;
 const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     //if ran with npx, basePath will be the root directory of the repository, even if we're executing from a sub folder (the root directory is where node_modules lives and package.json with workspaces)
     //so we manually find a packages folder, if it exists we go into that.
@@ -906,7 +943,7 @@ const buildMetadata = () => __awaiter(void 0, void 0, void 0, function* () {
                 }
                 else {
                     if (!response.packageUri) {
-                        console.warn("No package URI from meta data. Not building meta data for this package");
+                        console.warn('No package URI from meta data. Not building meta data for this package');
                         return;
                     }
                     let pkgNode = models_1.NamedNode.getOrCreate(response.packageUri);
@@ -1020,7 +1057,7 @@ const getLastCommitTime = (packagePath) => {
     // process.exit();
     return (0, utils_1.execPromise)(`git log -1 --format="%h %ci" -- ${packagePath}`)
         .then((result) => __awaiter(void 0, void 0, void 0, function* () {
-        let commitId = result.substring(0, result.indexOf(" "));
+        let commitId = result.substring(0, result.indexOf(' '));
         let date = result.substring(commitId.length + 1);
         let lastCommitDate = new Date(date);
         let changes = yield (0, utils_1.execPromise)(`git show --stat --oneline ${commitId} -- ${packagePath}`);
@@ -1080,10 +1117,10 @@ var publishUpdated = function (test = false) {
                 return chalk_1.default.gray(pckg.packageName + ' is private');
                 // return previousResult + ' ' + chalk.gray(pckg.packageName + ' is private\n');
             }
-            console.log("testing npm");
+            console.log('testing npm');
             return (0, utils_1.execPromise)('npm info ' + pckg.packageName + ' --json')
                 .then((output) => __awaiter(this, void 0, void 0, function* () {
-                console.log("testing npm done");
+                console.log('testing npm done');
                 var info;
                 try {
                     if (output == '' || output.includes('E404')) {
@@ -1123,10 +1160,10 @@ var publishUpdated = function (test = false) {
                             shouldPublish = lastPublishDate.getTime() < lastCommitInfo.date.getTime();
                             //ignore changes to package.json if that's the only change, because when we publish the version number changes, which is then committed
                             //(note there is always 2 lines for commit info + number of files changed)
-                            let changedFiles = lastCommitInfo.changes.split("\n").filter(line => line.includes("|"));
+                            let changedFiles = lastCommitInfo.changes.split('\n').filter((line) => line.includes('|'));
                             let numberOfFilesChanges = changedFiles.length;
                             // console.log("CHECK "+lastCommitInfo.changes.includes("package.json")+" - "+numberOfFilesChanges)
-                            if (shouldPublish && lastCommitInfo.changes.includes("package.json") && numberOfFilesChanges === 1) {
+                            if (shouldPublish && lastCommitInfo.changes.includes('package.json') && numberOfFilesChanges === 1) {
                                 shouldPublish = false;
                             }
                             if (shouldPublish) {
@@ -1136,7 +1173,10 @@ var publishUpdated = function (test = false) {
                                     lastPublishDate.toTimeString() +
                                     ' published ' +
                                     info.version);
-                                log(lastCommitInfo.date.toDateString() + ' ' + new Date(lastCommitInfo.date).toTimeString() + ' source last committed:');
+                                log(lastCommitInfo.date.toDateString() +
+                                    ' ' +
+                                    new Date(lastCommitInfo.date).toTimeString() +
+                                    ' source last committed:');
                                 log(lastCommitInfo.changes);
                             }
                         }
@@ -1199,7 +1239,7 @@ function getEnvJsonPath(relativeToPath = process.cwd()) {
         }
         // let path = './';
         for (let i = 0; i <= 10; i++) {
-            let envFile = yield (0, get_env_vars_1.getEnvFile)({ filePath: relativeToPath + path + '.env.json' }).catch(err => {
+            let envFile = yield (0, get_env_vars_1.getEnvFile)({ filePath: relativeToPath + path + '.env.json' }).catch((err) => {
                 return null;
             });
             if (envFile) {
@@ -1273,7 +1313,7 @@ var buildUpdated = function (back, target, target2, test = false) {
         let packagesLeft = packages.size;
         runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
             debugInfo('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
-            debugInfo((packagesLeft) + " packages left.");
+            debugInfo(packagesLeft + ' packages left.');
             packagesLeft = packagesLeft - packageGroup.length;
             return (pkg) => __awaiter(this, void 0, void 0, function* () {
                 // debugInfo('# Checking package ' + pkg.packageName);
@@ -1447,7 +1487,7 @@ var gitIgnore = function (...entries) {
 };
 var addLinesToFile = function (filePath, entries) {
     let fileContents = fs_extra_1.default.readFileSync(filePath, { encoding: 'utf8' });
-    entries.forEach(entry => {
+    entries.forEach((entry) => {
         fileContents += '\n' + entry;
     });
     fs_extra_1.default.writeFileSync(filePath, fileContents);
@@ -1461,12 +1501,12 @@ var addCapacitor = function (basePath = process.cwd()) {
         let envCmdPath = path_1.default.resolve(basePath, '.env-cmdrc.json');
         let envCmd = JSON.parse(fs_extra_1.default.readFileSync(envCmdPath, { encoding: 'utf8' }));
         envCmd['static-dev'] = {
-            "NODE_ENV": "production",
-            "SITE_ROOT": "http://localhost:4000",
-            "DATA_ROOT": "http://localhost:4000/data",
-            "OUTPUT_PATH": "./frontend/web/assets",
-            "ASSET_PATH": "./assets/",
-            "ENTRY_PATH": "./frontend/src/index-static.tsx"
+            NODE_ENV: 'production',
+            SITE_ROOT: 'http://localhost:4000',
+            DATA_ROOT: 'http://localhost:4000/data',
+            OUTPUT_PATH: './frontend/web/assets',
+            ASSET_PATH: './assets/',
+            ENTRY_PATH: './frontend/src/index-static.tsx',
         };
         fs_extra_1.default.writeFile(envCmdPath, JSON.stringify(envCmd, null, 2));
         log('Edited .env-cmdrc.json');

package/lib/cli.js

@@ -110,6 +110,9 @@ program.command('all [action] [filter] [filter-value]').action((command, filter,
 program.command('dev [target] [mode]').action((target, mode) => {
     (0, cli_methods_1.developPackage)(target, mode);
 });
+program.command('depcheck').action((target, mode) => {
+    (0, cli_methods_1.depCheck)();
+});
 program
     .command('package')
     .action((name, command, args) => {

package/lib/config-grunt.js

@@ -75,7 +75,7 @@ function setupGrunt(grunt, moduleName, config) {
     grunt.registerTask('build-es6', (0, utils_1.flatten)([
         'prepare-build',
         buildFrontend ? 'webpack:build-es6' : null,
-        buildServer ? ['clean:lib', 'exec:build-lib', 'copy:lib'] : null,
+        buildServer ? ['clean:lib', 'exec:build-lib', 'copy:lib', 'exec:depcheck'] : null,
         // 'exec:shapes',
     ]));
     grunt.registerTask('build-lib', ['prepare-build', 'exec:build-lib', 'copy:lib']);
@@ -96,6 +96,7 @@ function setupGrunt(grunt, moduleName, config) {
             'build-lib-es5': 'yarn exec tsc --pretty -p tsconfig-es5.json',
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
+            depcheck: 'yarn lincd depcheck',
             test: 'tsc -w',
             // shapes: 'lincd shapes',
             'css-declarations': 'tcm -p **/*.scss',

package/lib/utils.js

@@ -53,7 +53,6 @@ exports.getPackageJSON = getPackageJSON;
  * @param packageJson
  */
 var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
-    var _a;
     if (!packageJson) {
         packageJson = (0, exports.getPackageJSON)();
     }
@@ -81,33 +80,71 @@ var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
         }
     }
     if (firstTime) {
-        let dependencyMap = new Map();
+        // let dependencyMap:Map<string,Set<string>> = new Map();
         let lincdPackageNames = new Set(lincdPackagePaths.map(([packageName, modulePath, pkgDependencies]) => packageName));
         //remove lincd-cli from the list of lincd packages
         lincdPackageNames.delete('lincd-cli');
-        lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies]) => {
-            dependencyMap.set(packageName, new Set(pkgDependencies.filter(dependency => lincdPackageNames.has(dependency))));
+        lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies], key) => {
+            let lincdDependencies = pkgDependencies.filter(dependency => lincdPackageNames.has(dependency));
+            if (packageName === 'lincd-cli') {
+                //remove lincd-modules from the dependencies of lincd-cli (it's not a hard dependency, and it messes things up)
+                lincdDependencies.splice(lincdDependencies.indexOf('lincd-modules'), 1);
+            }
+            // dependencyMap.set(packageName, new Set(lincdDependencies));
+            //update dependencies to be the actual lincd package objects
+            lincdPackagePaths[key][2] = lincdDependencies;
         });
-        //remove lincd-modules from the dependencies of lincd-cli (it's not a hard dependency, and it messes things up)
-        (_a = dependencyMap.get('lincd-cli')) === null || _a === void 0 ? void 0 : _a.delete('lincd-modules');
-        //add the nested dependencies for each lincd package
-        for (let [packageName, pkgDependencies] of dependencyMap) {
-            pkgDependencies.forEach((dependency) => {
-                if (dependencyMap.has(dependency)) {
-                    dependencyMap.get(dependency).forEach((nestedDependency) => {
-                        pkgDependencies.add(nestedDependency);
-                    });
+        // //add the nested dependencies for each lincd package
+        // for (let [packageName,pkgDependencies] of dependencyMap) {
+        //   pkgDependencies.forEach((dependency) => {
+        //     if (dependencyMap.has(dependency)) {
+        //       dependencyMap.get(dependency).forEach((nestedDependency) => {
+        //         pkgDependencies.add(nestedDependency);
+        //       });
+        //     }
+        //   });
+        // }
+        //
+        // dependencyMap.forEach((dependencies,packageName) => {
+        //   //check for circular dependencies
+        //   if([...dependencies].some(dependency => {
+        //     return dependencyMap.get(dependency).has(packageName);
+        //   }))
+        //   {
+        //     console.warn(`Circular dependency detected between ${packageName} and ${dependency}`);
+        //   }
+        //
+        // });
+        // a simple sort with dependencyMap doesn't seem to work,so we start with LINCD (least dependencies) and from there add packages that have all their dependencies already added
+        let sortedPackagePaths = [];
+        let addedPackages = new Set(['lincd']);
+        sortedPackagePaths.push(lincdPackagePaths.find(([packageName]) => {
+            return packageName === 'lincd';
+        }));
+        while (addedPackages.size !== lincdPackagePaths.length) {
+            let startSize = addedPackages.size;
+            lincdPackagePaths.forEach(([packageName, modulePath, pkgDependencies]) => {
+                if (!addedPackages.has(packageName) && pkgDependencies.every(dependency => addedPackages.has(dependency))) {
+                    sortedPackagePaths.push([packageName, modulePath, pkgDependencies]);
+                    addedPackages.add(packageName);
                 }
             });
+            if (startSize === addedPackages.size) {
+                console.warn('Could not sort lincd packages, circular dependencies?');
+                break;
+            }
         }
         //sort the lincd packages by least dependent first
-        lincdPackagePaths.sort(([packageNameA, modulePathA, pkgDependenciesA], [packageNameB, modulePathB, pkgDependenciesB]) => {
-            //if package A depends on package B, then package B should come first
-            if (dependencyMap.get(packageNameA).has(packageNameB)) {
-                return 1;
-            }
-            return -1;
-        });
+        // lincdPackagePaths = lincdPackagePaths.sort(([packageNameA],[packageNameB]) => {
+        //   //if package A depends on package B, then package B should come first
+        //   if (dependencyMap.get(packageNameA).has(packageNameB)) {
+        //     console.log(packageNameA+' depends on '+packageNameB+ ' (below)')
+        //       return 1;
+        //   }
+        //   console.log(packageNameA+' above '+packageNameB)
+        //   return -1;
+        // });
+        return sortedPackagePaths;
     }
     return lincdPackagePaths;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -8,7 +8,6 @@
     "build": "npm exec tsc",
     "dev": "npm exec tsc -w"
   },
-  "lincd": true,
   "keywords": [
     "lincd",
     "cli",
@@ -45,6 +44,7 @@
     "commander": "^9.4.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
+    "depcheck": "^1.4.3",
     "env-cmd": "^10.1.0",
     "find-nearest-package-json": "^2.0.1",
     "fs-extra": "^10.1.0",