lincd-cli 1.2.1 → 1.2.2

package/lib/cjs/cli-methods.js

@@ -36,9 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeOldFiles = exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.compilePackageCJS = exports.compilePackageESM = exports.compilePackage = exports.buildPackage = exports.register = exports.createPackage = exports.upgradePackages = exports.buildApp = exports.startServer = exports.ensureEnvironmentLoaded = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.getScriptDir = exports.setNameVariables = exports.createOntology = exports.createApp = void 0;
+exports.removeOldFiles = exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.compilePackageCJS = exports.compilePackageESM = exports.compilePackage = exports.buildPackage = exports.register = exports.createPackage = exports.upgradePackages = exports.buildBackend = exports.buildFrontend = exports.buildApp = exports.startServer = exports.runMethod = exports.ensureEnvironmentLoaded = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.getScriptDir = exports.setNameVariables = exports.createOntology = exports.createApp = void 0;
 exports.warn = warn;
 exports.developPackage = developPackage;
+exports.runOnPackagesGroupedByDependencies = runOnPackagesGroupedByDependencies;
 exports.buildAll = buildAll;
 exports.getLincdPackages = getLincdPackages;
 const chalk_1 = __importDefault(require("chalk"));
@@ -51,6 +52,7 @@ const utils_js_1 = require("./utils.js");
 const fs_1 = require("fs");
 const find_nearest_package_json_1 = require("find-nearest-package-json");
 const LinkedFileStorage_1 = require("lincd/utils/LinkedFileStorage");
+const child_process_2 = require("child_process");
 // import pkg from 'lincd/utils/LinkedFileStorage';
 // const { LinkedFileStorage } = pkg;
 // const config = require('lincd-server/site.webpack.config');
@@ -895,19 +897,19 @@ invalidImports = new Map()) => {
             if ((0, utils_js_1.isImportOutsideOfPackage)(i, depth)) {
                 invalidImports.get(filename).push({
                     type: 'outside_package',
-                    importPath: i
+                    importPath: i,
                 });
             }
             if ((0, utils_js_1.isInvalidLINCDImport)(i, depth)) {
                 invalidImports.get(filename).push({
                     type: 'lincd',
-                    importPath: i
+                    importPath: i,
                 });
             }
             if ((0, utils_js_1.isImportWithMissingExtension)(i)) {
                 invalidImports.get(filename).push({
                     type: 'missing_extension',
-                    importPath: i
+                    importPath: i,
                 });
             }
         });
@@ -986,7 +988,10 @@ const depCheck = async (packagePath = process.cwd()) => {
                 if (missingLincdPackages.length > 0) {
                     reject(chalk_1.default.red(packagePath.split('/').pop() +
                         '\n[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
-                        missingLincdPackages.join(',\n- ')));
+                        missingLincdPackages.map(missedKey => {
+                            const files = results.missing[missedKey];
+                            return `${missedKey} (${files.length} files: ${files.join(', ')})`;
+                        }).join(',\n- ')));
                 }
                 else if (missing.length > 0) {
                     resolve(chalk_1.default.redBright('warning: ' + packagePath.split('/').pop() +
@@ -1055,6 +1060,81 @@ const ensureEnvironmentLoaded = async () => {
     }
 };
 exports.ensureEnvironmentLoaded = ensureEnvironmentLoaded;
+const runMethod = async (packageName, method, options) => {
+    await (0, exports.ensureEnvironmentLoaded)();
+    if (options.spawn) {
+        let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s)))).default;
+        //@ts-ignore
+        const ServerClass = (await Promise.resolve().then(() => __importStar(require('lincd-server/shapes/LincdServer')))).LincdServer;
+        await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
+        let server = new ServerClass({
+            loadAppComponent: async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default,
+            ...lincdConfig,
+        });
+        //init the server
+        console.log('Initializing server...');
+        server.initOnly().then(() => {
+            //process the backend method call
+            console.log('Running method ' + method);
+            //mock the request and response objects
+            let request = {
+                body: {},
+                query: {},
+                params: {},
+                headers: {},
+                method: 'POST',
+                url: '/' + packageName + '/' + method,
+            };
+            let response = {
+                status: (statusCode) => {
+                    console.log('Response status code:', statusCode);
+                    return response;
+                },
+                json: (data) => {
+                    console.log('Response data:', data);
+                },
+                send: (data) => {
+                    console.log('Response data:', data);
+                },
+            };
+            //TODO; allow sending args
+            server.callBackendMethod(packageName, method, [], request, response).then(() => {
+                console.log('Done');
+                process.exit();
+            });
+        });
+    }
+    else {
+        //reuse the existing running LincdServer instance.
+        //make a HTTP call
+        //'/call/:pkg/:method',
+        fetch(process.env.SITE_ROOT + '/call/' + packageName + '/' + method, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        }).then((response) => {
+            if (!response.ok) {
+                throw new Error('Network response was not ok');
+            }
+            return response.json();
+        }).then((data) => {
+            console.log('Response data:', data);
+            process.exit();
+        }).catch((error) => {
+            var _a;
+            if (error.code === 'ECONNREFUSED' || ((_a = error.cause) === null || _a === void 0 ? void 0 : _a.code) === 'ECONNREFUSED') {
+                console.error(chalk_1.default.red('Could not connect to the backend server. Is it running?'));
+                console.error(`Make sure you ${chalk_1.default.magenta('run "yarn start" in a separate process')} before calling this method.`);
+            }
+            else {
+                console.error('Error during backend call:', error);
+            }
+            process.exit(1);
+        });
+    }
+};
+exports.runMethod = runMethod;
 const startServer = async (initOnly = false, ServerClass = null) => {
     await (0, exports.ensureEnvironmentLoaded)();
     let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s)))).default;
@@ -1073,9 +1153,17 @@ const startServer = async (initOnly = false, ServerClass = null) => {
         ServerClass = (await Promise.resolve().then(() => __importStar(require('lincd-server/shapes/LincdServer')))).LincdServer;
     }
     await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
+    let appPromise;
+    if (process.env.NODE_ENV !== 'development') {
+        appPromise = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lib', 'App.js')}`).then(s => __importStar(require(s)))).default;
+    }
+    else {
+        appPromise = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App.js')}`).then(s => __importStar(require(s)))).default;
+    }
     let server = new ServerClass({
-        loadAppComponent: async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default,
-        ...lincdConfig,
+        loadAppComponent: async () => {
+            return appPromise;
+        }, ...lincdConfig,
     });
     //Important to use slice, because when using clusers, child processes need to be able to read the same arguments
     let args = process.argv.slice(2);
@@ -1089,10 +1177,16 @@ const startServer = async (initOnly = false, ServerClass = null) => {
 };
 exports.startServer = startServer;
 const buildApp = async () => {
+    await (0, exports.buildFrontend)();
+    await (0, exports.buildBackend)();
+    console.log(chalk_1.default.magenta(`✅ ${process.env.NODE_ENV} app build finished`));
+};
+exports.buildApp = buildApp;
+const buildFrontend = async () => {
     await (0, exports.ensureEnvironmentLoaded)();
     const webpackAppConfig = await (await Promise.resolve().then(() => __importStar(require('./config-webpack-app.js')))).getWebpackAppConfig();
-    console.log(chalk_1.default.magenta(`Building ${process.env.NODE_ENV} app bundles`));
-    return new Promise((resolve, reject) => {
+    console.log(chalk_1.default.magenta(`🛠 Building ${process.env.NODE_ENV} frontend bundles`));
+    await new Promise((resolve, reject) => {
         (0, webpack_1.default)(webpackAppConfig, async (err, stats) => {
             if (err) {
                 console.error(err.stack || err);
@@ -1130,11 +1224,13 @@ const buildApp = async () => {
         // and if we want to upload to storage, we need set S3_BUCKET_ENDPOINT
         if (process.env.NODE_ENV === 'development' || !process.env.S3_BUCKET_ENDPOINT) {
             console.warn('Upload build to storage skip in development environment or S3_BUCKET_ENDPOINT is not set');
-            process.exit();
+            return;
+            // process.exit();
         }
         if (process.env.APP_ENV) {
             console.warn('Not uploading to CDN for app builds');
-            process.exit();
+            return;
+            // process.exit();
         }
         // load the storage config
         const storageConfig = await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
@@ -1150,6 +1246,12 @@ const buildApp = async () => {
             }
             // get all files in the web directory and then upload them to the storage
             const files = await (0, utils_js_1.getFiles)(pathDir);
+            console.log(chalk_1.default.magenta(`🕊  Publishing ${files.length} public files to linked file storage`));
+            const clearSpinner = (0, ora_1.default)({
+                discardStdin: true,
+                text: `Publishing ${files.length} public files`,
+            }).start();
+            let counter = 0;
             const uploads = files.map(async (filePath) => {
                 // read file content
                 const fileContent = await fs_extra_1.default.promises.readFile(filePath);
@@ -1157,15 +1259,77 @@ const buildApp = async () => {
                 // example: /Users/username/project/www/index.html -> /project/www/index.html
                 const pathname = filePath.replace(pathDir, `/${rootDirectory}`);
                 // upload file to storage
-                return await LinkedFileStorage_1.LinkedFileStorage.saveFile(pathname, fileContent);
+                await LinkedFileStorage_1.LinkedFileStorage.saveFile(pathname, fileContent).then(() => {
+                    clearSpinner.text = `${counter++}/${files.length}: - Published ${pathname} `;
+                }).catch(console.error);
             });
             const urls = await Promise.all(uploads);
-            console.log(`${urls.length} files uploaded to storage`);
-            process.exit();
+            clearSpinner.succeed(`${urls.length} files uploaded to storage`);
         }
     });
 };
-exports.buildApp = buildApp;
+exports.buildFrontend = buildFrontend;
+const buildBackend = async () => {
+    console.log(chalk_1.default.magenta(`🛠 Preparing ${process.env.NODE_ENV} backend`));
+    //run tsc in the backend folder
+    await (0, exports.ensureEnvironmentLoaded)();
+    const sourceFolder = path_1.default.join(process.cwd(), 'src');
+    const targetFolder = path_1.default.join(process.cwd(), 'lib');
+    // Step 1: Clear lib folder
+    const clearSpinner = (0, ora_1.default)({
+        discardStdin: true,
+        text: 'Clearing lib folder',
+    }).start();
+    try {
+        if (fs_extra_1.default.existsSync(targetFolder)) {
+            await fs_extra_1.default.remove(targetFolder);
+        }
+        clearSpinner.succeed('Lib folder cleared');
+    }
+    catch (e) {
+        console.error(e);
+        clearSpinner.fail('Failed to clear lib folder');
+        return;
+    }
+    // Step 2: Compile TS files
+    const compileSpinner = (0, ora_1.default)({
+        discardStdin: true,
+        text: 'Compiling backend TS files',
+    }).start();
+    try {
+        await (0, utils_js_1.execPromise)(`yarn exec tsc`);
+        compileSpinner.succeed('Backend TS files compiled');
+    }
+    catch (e) {
+        console.error(e);
+        compileSpinner.fail('Failed to compile backend TS files');
+        return;
+    }
+    // Step 3: Copy CSS files
+    const copySpinner = (0, ora_1.default)({
+        discardStdin: true,
+        text: 'Copying CSS files',
+    }).start();
+    try {
+        const cssFiles = await (0, utils_js_1.getFiles)(sourceFolder, '.css');
+        await Promise.all(cssFiles.map((file) => {
+            const targetFile = file.replace(sourceFolder, targetFolder);
+            //ensure the target folder exists
+            const targetDir = path_1.default.dirname(targetFile);
+            if (!fs_extra_1.default.existsSync(targetDir)) {
+                fs_extra_1.default.mkdirSync(targetDir, { recursive: true });
+            }
+            return fs_extra_1.default.copyFile(file, targetFile);
+        }));
+        copySpinner.succeed(`${cssFiles.length} CSS files copied`);
+    }
+    catch (e) {
+        console.error(e);
+        copySpinner.fail('Failed to copy CSS files');
+    }
+    return true;
+};
+exports.buildBackend = buildBackend;
 const upgradePackages = async () => {
     await (0, exports.ensureEnvironmentLoaded)();
     // let packages = getLincdPackages();
@@ -1492,6 +1656,10 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
             });
         });
     };
+    buildStep({
+        name: 'Checking imports',
+        apply: () => (0, exports.checkImports)(packagePath + '/src'),
+    });
     buildStep({
         name: 'Compiling ESM',
         apply: async () => {
@@ -1538,16 +1706,12 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
             return (0, exports.removeOldFiles)(packagePath);
         },
     });
-    buildStep({
-        name: 'Checking imports',
-        apply: () => (0, exports.checkImports)(packagePath),
-    });
     buildStep({
         name: 'Checking dependencies',
         apply: () => (0, exports.depCheck)(packagePath),
     });
     let success = await buildProcess.catch(err => {
-        let msg = typeof err === 'string' || err instanceof Error ? err.toString() : (err.error && !err.error.toString().includes("Command failed:") ? err.error : err.stdout + '\n' + err.stderr);
+        let msg = typeof err === 'string' || err instanceof Error ? err.toString() : (err.error && !err.error.toString().includes('Command failed:') ? err.error : err.stdout + '\n' + err.stderr);
         if (logResults) {
             spinner.stopAndPersist({
                 symbol: chalk_1.default.red('✖'),
@@ -1619,7 +1783,7 @@ const compilePackageCJS = async (packagePath = process.cwd()) => {
         return res === '';
     }).catch(err => {
         return {
-            error: err.stdout
+            error: err.stdout,
         };
     });
 };
@@ -1840,16 +2004,26 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
     // let packages = getLocalLincdModules();
     let packages = getLocalLincdPackageMap();
     // console.log(packages);
-    let jsonldPkgUpdated = await (0, utils_js_1.needsRebuilding)(packages.get('lincd-jsonld'), useGitForLastModified);
+    // let jsonldPkgUpdated = await needsRebuilding(
+    //   packages.get('lincd-jsonld'),
+    //   useGitForLastModified,
+    // );
     // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
     //if either cli or jsonldPkg needs to be rebuilt
     // if (jsonldPkgUpdated || cliPkgUpdated) {
-    if (jsonldPkgUpdated) {
-        await (0, utils_js_1.execPromise)('yarn exec tsc && echo "compiled lincd-jsonld"', false, false, {
-            cwd: packages.get('lincd-jsonld').path,
-        }, true);
-        // await execPromise('yarn build-core', false, false, {}, true);
-    }
+    // if (jsonldPkgUpdated)
+    // {
+    //   await execPromise(
+    //     'yarn exec tsc && echo "compiled lincd-jsonld"',
+    //     false,
+    //     false,
+    //     {
+    //       cwd: packages.get('lincd-jsonld').path,
+    //     },
+    //     true,
+    //   );
+    //   // await execPromise('yarn build-core', false, false, {}, true);
+    // }
     let rebuildAllModules = false;
     // if (cliPkgUpdated) {
     //   rebuildAllModules = true;
@@ -1863,9 +2037,10 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
         return async (pkg) => {
             // debugInfo('# Checking package ' + pkg.packageName);
             let needRebuild = await (0, utils_js_1.needsRebuilding)(pkg, useGitForLastModified);
-            if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
-                needRebuild = true;
-            }
+            // if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated)
+            // {
+            //   needRebuild = true;
+            // }
             if (needRebuild || rebuildAllModules) {
                 //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
                 // log(packageName+' modified since last commit on '+now.toString());
@@ -1887,7 +2062,7 @@ var buildUpdated = async function (back, target, target2, useGitForLastModified
                     }
                     else if (typeof res === 'string') {
                         warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
-                        // console.log(res);
+                        console.log(res);
                         process.exit(1);
                     }
                 })
@@ -2044,15 +2219,14 @@ var executeCommandForPackage = function (packageName, command) {
     if (packageDetails) {
         log('Executing \'cd ' +
             packageDetails.path +
-            ' && yarn exec lincd' +
+            ' && yarn lincd' +
             (command ? ' ' + command : '') +
             '\'');
-        //TODO : replace with spawn("path to executable", ["params"], {stdio: "inherit"});
-        // maybe make spawnPromise that returns a promise
-        return (0, utils_js_1.execp)('cd ' +
-            packageDetails.path +
-            ' && yarn exec lincd' +
-            (command ? ' ' + command : ''));
+        (0, child_process_2.spawn)(process.platform === 'win32' ? 'yarn.cmd' : 'yarn', // Windows quirk
+        ['lincd', command || null], {
+            cwd: packageDetails.path,
+            stdio: 'inherit',
+        });
     }
     else {
         warn('Could not find a pkg who\'s name (partially) matched ' +