lincd-cli 0.2.37 → 0.2.39

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

@@ -0,0 +1,23 @@
+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
+.idea
+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/defaults/app-with-workspace/gitignore.template

@@ -0,0 +1 @@
+mrgit.json

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.depCheck = exports.createComponent = exports.createSetComponent = exports.createShape = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = 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.setNameVariables = 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");
@@ -56,7 +56,7 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     if (!name) {
         console.warn('Please provide a name as the first argument');
     }
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     let targetFolder = path_1.default.join(basePath, hyphenName);
     if (!fs_extra_1.default.existsSync(targetFolder)) {
         fs_extra_1.default.mkdirSync(targetFolder);
@@ -64,13 +64,17 @@ 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.mkdirSync(path_1.default.join(targetFolder, 'data/uploads/resized'), { recursive: true });
+    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
     yield replaceVariablesInFolder(targetFolder);
     let hasYarn = yield hasYarnInstalled();
-    let installCommand = hasYarn ? 'yarn install' : 'npm install';
+    let installCommand = hasYarn
+        ? 'export NODE_OPTIONS="--no-network-family-autoselection" && yarn install'
+        : 'npm install';
     yield (0, utils_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
         console.warn('Could not install dependencies or start application');
     });
@@ -101,11 +105,11 @@ function debugInfo(...messages) {
     //   console.log(gruntConfig);
     //   process.exit();
     // }
-    // if (gruntConfig && gruntConfig.analyse === true) {
-    messages.forEach((message) => {
-        console.log(chalk_1.default.cyan('Info: ') + message);
-    });
-    // }
+    if (gruntConfig && gruntConfig.analyse === true) {
+        messages.forEach((message) => {
+            console.log(chalk_1.default.cyan('Info: ') + message);
+        });
+    }
 }
 function warn(...messages) {
     messages.forEach((message) => {
@@ -235,8 +239,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 = [];
@@ -254,15 +262,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(" "))
@@ -282,19 +295,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) {
@@ -353,7 +366,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
@@ -487,8 +504,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);
@@ -524,7 +541,7 @@ const createOntology = (prefix, uriBase, basePath = process.cwd()) => __awaiter(
         uriBase = 'http://lincd.org/ont/' + prefix + '/';
     }
     setVariable('uri_base', uriBase);
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(prefix);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(prefix);
     //copy ontology accessor file
     log("Creating files for ontology '" + prefix + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
@@ -638,6 +655,7 @@ const setNameVariables = function (name) {
     setVariable('plain_name', plainName);
     return { hyphenName, camelCaseName, underscoreName, plainName };
 };
+exports.setNameVariables = setNameVariables;
 function getSourceFolder(basePath = process.cwd()) {
     //LINCD App
     if (fs_extra_1.default.existsSync(path_1.default.join(basePath, 'frontend', 'src'))) {
@@ -655,7 +673,7 @@ function getSourceFolder(basePath = process.cwd()) {
 const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'shapes');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     // log("Creating files for shape '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
@@ -673,7 +691,7 @@ const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0
 exports.createShape = createShape;
 const createSetComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let targetFolder = ensureFolderExists(basePath, 'src', 'components');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     log("Creating files for set component '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
@@ -689,7 +707,7 @@ exports.createSetComponent = createSetComponent;
 const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'components');
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(name);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
     log("Creating files for component '" + name + "'");
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.tsx');
@@ -712,9 +730,9 @@ const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
         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"));
+            missing.splice(missing.indexOf('react'));
             if (missing.length > 0) {
-                console.warn(chalk_1.default.red("Missing dependencies:\n\t" + missing.join(",\n\t")));
+                console.warn(chalk_1.default.red('Missing dependencies:\n\t' + missing.join(',\n\t')));
             }
         }
         // if(Object.keys(results.invalidFiles).length > 0) {
@@ -755,7 +773,7 @@ const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(voi
     setVariable('package_name', name);
     //extra variable for clarity (will be same as 'name')
     setVariable('output_file_name', name);
-    let { hyphenName, camelCaseName, underscoreName } = setNameVariables(cleanPackageName);
+    let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(cleanPackageName);
     log("Creating new LINCD package '" + name + "'");
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package'), targetFolder);
     //replace variables in some of the copied files
@@ -929,7 +947,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);
@@ -1043,7 +1061,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}`);
@@ -1103,10 +1121,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')) {
@@ -1146,10 +1164,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) {
@@ -1159,7 +1177,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);
                             }
                         }
@@ -1222,7 +1243,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) {
@@ -1296,7 +1317,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);
@@ -1466,15 +1487,16 @@ exports.executeCommandForEachPackage = executeCommandForEachPackage;
 var gitIgnore = function (...entries) {
     //add each entry to the .gitignore file
     let gitIgnorePath = path_1.default.resolve(process.cwd(), '.gitignore');
-    addLinesToFile(gitIgnorePath, entries);
+    (0, exports.addLinesToFile)(gitIgnorePath, 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);
 };
+exports.addLinesToFile = addLinesToFile;
 var addCapacitor = function (basePath = process.cwd()) {
     return __awaiter(this, void 0, void 0, function* () {
         let targetFolder = ensureFolderExists(basePath);
@@ -1484,12 +1506,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -41,13 +41,13 @@
     "chalk": "4.1.0",
     "child-process-promise": "^2.2.1",
     "colors": "^1.4.0",
-    "commander": "^9.4.0",
+    "commander": "^11.0.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",
+    "fs-extra": "^11.1.1",
     "glob": "^7.1.6",
     "grunt": "^1.3.0",
     "grunt-cli": "^1.4.3",
@@ -58,8 +58,8 @@
     "grunt-ts": "^6.0.0-beta.22",
     "grunt-webpack": "^5.0.0",
     "license-info-webpack-plugin": "^3.0.0",
-    "lincd": "^0.5",
-    "lincd-jsonld": "^0.1.21",
+    "lincd": "0.5.26",
+    "lincd-jsonld": "^0.1.22",
     "lincd-modules": "^0.1",
     "load-grunt-tasks": "^5.1.0",
     "mini-css-extract-plugin": "^2.7.5",

package/defaults/app-with-backend/scripts/prepare.js

@@ -1,16 +0,0 @@
-const fs = require('fs');
-const which = require('which');
-const homedir = require('os').homedir();
-const path = require('path');
-
-which('node').then(resolved => {
-  try {
-    fs.writeFileSync(
-      path.join(homedir, '.huskyrc'),
-      `export PATH="${path.join(resolved, '..')}:$PATH"`,
-    );
-  } catch (err) {
-    console.log(err);
-  }
-  console.log('created .huskyrc in ' + homedir);
-});