@cyklang/cli 0.5.0 → 0.5.1

package/build/Cmd.js

@@ -24,7 +24,7 @@ class Cmd extends commander_1.Command {
         const structure = new core_1.Structure();
         if (process.env.DBREMOTE_URL === undefined)
             throw 'DBREMOTE_URL undefined';
-        logger.debug('Cmd.DBREMOTE_URL ' + process.env.DBREMOTE_URL);
+        logger.info('Cyk server: ' + process.env.DBREMOTE_URL);
         const nodeCrypto = new NodeCrypto_1.NodeCrypto();
         this.dbRemote = new core_1.DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto);
         const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD);

package/build/InstallCommand.d.ts

@@ -0,0 +1,10 @@
+import { Cmd } from "./Cmd";
+export declare class InstallCommand extends Cmd {
+    constructor(name: string);
+    install(node_package: string, options: any): Promise<void>;
+    /**
+     * method verifyPackageJson
+     * @param node_package
+     */
+    verifyPackageJson(node_package: string): Promise<void>;
+}

package/build/InstallCommand.js

@@ -0,0 +1,87 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InstallCommand = void 0;
+const Cmd_1 = require("./Cmd");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const loglevel_1 = __importDefault(require("loglevel"));
+const ModuleCommand_1 = require("./ModuleCommand");
+const logger = loglevel_1.default.getLogger('InstallCommand.ts');
+logger.setLevel('debug');
+class InstallCommand extends Cmd_1.Cmd {
+    constructor(name) {
+        super(name);
+        this.description('upload Cyk modules to a Cyk server from a Node package downloaded by "npm install" ')
+            .argument('<node_package>', 'Node Package installed as dependency')
+            .action(async (node_package, options) => {
+            await this.install(node_package, options);
+        });
+    }
+    async install(node_package, options) {
+        try {
+            await this.prologue(options);
+            if (this.dbManager === undefined)
+                throw 'dbManager undefined';
+            await this.verifyPackageJson(node_package);
+            const xmlFolder = path.join('node_modules', node_package, 'xml');
+            if (!fs.existsSync(xmlFolder) || !fs.statSync(xmlFolder).isDirectory()) {
+                throw 'xml folder not found ( ' + xmlFolder + ' )';
+            }
+            const files = fs.readdirSync(xmlFolder);
+            for (let ind = 0; ind < files.length; ind++) {
+                const file = files[ind];
+                await (0, ModuleCommand_1.uploadModule)(path.join(xmlFolder, file), this.dbManager);
+            }
+        }
+        catch (err) {
+            logger.error(err);
+        }
+    }
+    /**
+     * method verifyPackageJson
+     * @param node_package
+     */
+    async verifyPackageJson(node_package) {
+        let packageJson;
+        try {
+            // Lecture du contenu du fichier package.json en tant que chaîne de caractères
+            const packageJsonContent = fs.readFileSync('package.json', 'utf8');
+            // Analyse du contenu en tant qu'objet JSON
+            packageJson = JSON.parse(packageJsonContent);
+        }
+        catch (error) {
+            console.error('Error loading package.json file :', error);
+            throw error;
+        }
+        if (!packageJson.dependencies || !packageJson.dependencies[node_package]) {
+            throw node_package + ' not installed in the current project. Install it first with "npm install"';
+        }
+    }
+}
+exports.InstallCommand = InstallCommand;

package/build/ModuleCommand.d.ts

@@ -1,5 +1,12 @@
 #!/usr/bin/env ts-node
+import { DBManager } from "@cyklang/core";
 import { Command } from 'commander';
 export declare class ModuleCommand extends Command {
     constructor(name: string);
 }
+/**
+ *
+ * @param file
+ * @param dbManager
+ */
+export declare function uploadModule(file: string, dbManager: DBManager): Promise<void>;

package/build/ModuleCommand.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleCommand = void 0;
+exports.uploadModule = exports.ModuleCommand = void 0;
 const core_1 = require("@cyklang/core");
 const fs = __importStar(require("fs"));
 const loglevel_1 = __importDefault(require("loglevel"));
@@ -135,30 +135,7 @@ class ModuleU extends Cmd_1.Cmd {
             else {
                 for (let ind = 0; ind < files.length; ind++) {
                     const file = files[ind];
-                    const dbname = getModuleDBName(file);
-                    const source = fs.readFileSync(file).toString();
-                    const tag = (0, core_1.parseXML)(dbname, source);
-                    const dbModuleExist = await this.dbManager.dbModuleExist(dbname);
-                    if (dbModuleExist === undefined) {
-                        // insert
-                        const dbModule = new core_1.DBModule();
-                        dbModule.source = source;
-                        dbModule.dbname = dbname;
-                        dbModule.access = tag.attributes.ACCESS;
-                        dbModule.description = tag.attributes.DESCRIPTION;
-                        logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description);
-                        const id = await this.dbManager.dbModuleInsert(dbModule);
-                        logger.info('module ' + dbname + ' added with ID ' + id);
-                    }
-                    else {
-                        // update
-                        dbModuleExist.source = source;
-                        dbModuleExist.access = tag.attributes.ACCESS;
-                        dbModuleExist.description = tag.attributes.DESCRIPTION;
-                        logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description);
-                        await this.dbManager.dbModuleUpdate(dbModuleExist);
-                        logger.info('module ' + dbname + ' updated');
-                    }
+                    await uploadModule(file, this.dbManager);
                 }
             }
         }
@@ -167,6 +144,38 @@ class ModuleU extends Cmd_1.Cmd {
         }
     }
 }
+/**
+ *
+ * @param file
+ * @param dbManager
+ */
+async function uploadModule(file, dbManager) {
+    const dbname = getModuleDBName(file);
+    const source = fs.readFileSync(file).toString();
+    const tag = (0, core_1.parseXML)(dbname, source);
+    const dbModuleExist = await dbManager.dbModuleExist(dbname);
+    if (dbModuleExist === undefined) {
+        // insert
+        const dbModule = new core_1.DBModule();
+        dbModule.source = source;
+        dbModule.dbname = dbname;
+        dbModule.access = tag.attributes.ACCESS;
+        dbModule.description = tag.attributes.DESCRIPTION;
+        // logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description)
+        const id = await dbManager.dbModuleInsert(dbModule);
+        logger.info('module ' + dbname + ' added with ID ' + id);
+    }
+    else {
+        // update
+        dbModuleExist.source = source;
+        dbModuleExist.access = tag.attributes.ACCESS;
+        dbModuleExist.description = tag.attributes.DESCRIPTION;
+        // logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description)
+        await dbManager.dbModuleUpdate(dbModuleExist);
+        logger.info('module ' + dbname + ' updated');
+    }
+}
+exports.uploadModule = uploadModule;
 class ModuleDownload extends Cmd_1.Cmd {
     constructor(name, description) {
         super(name);

package/build/OpenCommand.d.ts

@@ -1,5 +1,5 @@
 import { Cmd } from "./Cmd";
 export declare class OpenCommand extends Cmd {
-    constructor();
+    constructor(name: string);
     openBrowser(module: string, options: any): Promise<void>;
 }

package/build/OpenCommand.js

@@ -9,8 +9,8 @@ const loglevel_1 = __importDefault(require("loglevel"));
 const logger = loglevel_1.default.getLogger('OpenCommand.ts');
 logger.setLevel('debug');
 class OpenCommand extends Cmd_1.Cmd {
-    constructor() {
-        super('open');
+    constructor(name) {
+        super(name);
         this.description('open browser').version('0.1')
             .argument('<module>', 'module to execute')
             .action(async (module, options) => {

package/build/RunCommand.d.ts

@@ -1,5 +1,5 @@
 import { Cmd } from "./Cmd";
 export declare class RunCommand extends Cmd {
-    constructor();
+    constructor(name: string);
     runFiles(files: string[], options: any): Promise<void>;
 }

package/build/RunCommand.js

@@ -36,8 +36,8 @@ const Cmd_1 = require("./Cmd");
 loglevel_1.default.setLevel('debug');
 const logger = loglevel_1.default.getLogger('RunCommand.ts');
 class RunCommand extends Cmd_1.Cmd {
-    constructor() {
-        super('run');
+    constructor(name) {
+        super(name);
         this.description('run module').version('0.2')
             .argument('<files...>', 'local module file(s) to run')
             .action(async (files, options) => {

package/build/index.js

@@ -12,7 +12,7 @@ const QueryCommand_1 = require("./QueryCommand");
 const TableCommand_1 = require("./TableCommand");
 const TestCommand_1 = require("./TestCommand");
 const RunCommand_1 = require("./RunCommand");
-const InitCommand_1 = require("./InitCommand");
+const InstallCommand_1 = require("./InstallCommand");
 const AssetCommand_1 = require("./AssetCommand");
 const OpenCommand_1 = require("./OpenCommand");
 const logger = loglevel_1.default.getLogger("index.ts");
@@ -20,7 +20,8 @@ logger.setLevel("debug");
 const program = new commander_1.Command();
 program.name('cyk').description('cyklang CLI')
     .version('0.2');
-program.addCommand(new InitCommand_1.InitCommand('init'));
+program.addCommand(new InstallCommand_1.InstallCommand('install'));
+program.addCommand(new InstallCommand_1.InstallCommand('i'));
 program.addCommand(new AssetCommand_1.AssetCommand('asset', 'manage assets'));
 program.addCommand(new AssetCommand_1.AssetCommand('a', 'manage assets'));
 program.addCommand(new ModuleCommand_1.ModuleCommand('module'));
@@ -32,6 +33,8 @@ program.addCommand(new QueryCommand_1.QueryCommand('q'));
 program.addCommand(new TableCommand_1.TableCommand('table'));
 program.addCommand(new TableCommand_1.TableCommand('t'));
 program.addCommand(new TestCommand_1.TestCommand());
-program.addCommand(new RunCommand_1.RunCommand());
-program.addCommand(new OpenCommand_1.OpenCommand());
+program.addCommand(new RunCommand_1.RunCommand('run'));
+program.addCommand(new RunCommand_1.RunCommand('r'));
+program.addCommand(new OpenCommand_1.OpenCommand('open'));
+program.addCommand(new OpenCommand_1.OpenCommand('o'));
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@cyklang/cli",
-   "version": "0.5.0",
+   "version": "0.5.1",
    "description": "cyklang CLI",
    "main": "build/index.js",
    "scripts": {

package/src/Cmd.ts

@@ -23,7 +23,7 @@ export class Cmd extends Command {
 
         const structure = new Structure()
         if (process.env.DBREMOTE_URL === undefined) throw 'DBREMOTE_URL undefined'
-        logger.debug('Cmd.DBREMOTE_URL ' + process.env.DBREMOTE_URL)
+        logger.info('Cyk server: ' + process.env.DBREMOTE_URL)
         const nodeCrypto = new NodeCrypto()
         this.dbRemote = new DBRemote(structure.scope, process.env.DBREMOTE_URL, nodeCrypto)
         const login = await this.dbRemote.signin(process.env.USER_NAME, undefined, process.env.USER_PASSWORD)

package/src/InstallCommand.ts

@@ -0,0 +1,71 @@
+import { Cmd } from "./Cmd";
+import * as fs from "fs"
+import * as path from "path"
+
+import loglevel from 'loglevel'
+import { uploadModule } from "./ModuleCommand";
+const logger = loglevel.getLogger('InstallCommand.ts')
+logger.setLevel('debug')
+
+export class InstallCommand extends Cmd {
+    constructor(name: string) {
+        super(name)
+        this.description('upload Cyk modules to a Cyk server from a Node package downloaded by "npm install" ')
+            .argument('<node_package>', 'Node Package installed as dependency')
+            .action(async (node_package: any, options: any) => {
+                await this.install(node_package, options)
+            })
+    }
+
+    async install(node_package: string, options: any) {
+        try {
+            await this.prologue(options)
+            if (this.dbManager === undefined) throw 'dbManager undefined'
+            await this.verifyPackageJson(node_package)
+
+            const xmlFolder = path.join('node_modules', node_package, 'xml')
+            if (!fs.existsSync(xmlFolder) || !fs.statSync(xmlFolder).isDirectory()) {
+                throw 'xml folder not found ( ' + xmlFolder + ' )'
+            }
+
+            const files = fs.readdirSync(xmlFolder)
+            for (let ind = 0; ind < files.length; ind++) {
+                const file = files[ind]
+                await uploadModule(path.join(xmlFolder, file), this.dbManager)
+            }
+        }
+        catch (err) {
+            logger.error(err)
+        }
+    }
+
+    /**
+     * method verifyPackageJson
+     * @param node_package 
+     */
+    async verifyPackageJson(node_package: string) {
+
+        let packageJson: any
+
+        try {
+            // Lecture du contenu du fichier package.json en tant que chaîne de caractères
+            const packageJsonContent = fs.readFileSync('package.json', 'utf8');
+
+            // Analyse du contenu en tant qu'objet JSON
+            packageJson = JSON.parse(packageJsonContent);
+
+        } catch (error) {
+            console.error('Error loading package.json file :', error);
+            throw error
+        }
+
+        if (!packageJson.dependencies || !packageJson.dependencies[node_package]) {
+            throw node_package + ' not installed in the current project. Install it first with "npm install"'
+        }
+
+
+
+    }
+
+
+}

package/src/ModuleCommand.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env ts-node
-import { DBModule, parseXML } from "@cyklang/core"
+import { DBManager, DBModule, parseXML } from "@cyklang/core"
 import * as fs from "fs"
 import loglevel from 'loglevel'
 import path from "path"
@@ -115,30 +115,7 @@ class ModuleU extends Cmd {
             else {
                 for (let ind = 0; ind < files.length; ind++) {
                     const file = files[ind]
-                    const dbname = getModuleDBName(file)
-                    const source = fs.readFileSync(file).toString()
-                    const tag = parseXML(dbname, source)
-                    const dbModuleExist = await this.dbManager.dbModuleExist(dbname)
-                    if (dbModuleExist === undefined) {
-                        // insert
-                        const dbModule = new DBModule()
-                        dbModule.source = source
-                        dbModule.dbname = dbname
-                        dbModule.access = tag.attributes.ACCESS
-                        dbModule.description = tag.attributes.DESCRIPTION
-                        logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description)
-                        const id = await this.dbManager.dbModuleInsert(dbModule)
-                        logger.info('module ' + dbname + ' added with ID ' + id)
-                    }
-                    else {
-                        // update
-                        dbModuleExist.source = source
-                        dbModuleExist.access = tag.attributes.ACCESS
-                        dbModuleExist.description = tag.attributes.DESCRIPTION
-                        logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description)
-                        await this.dbManager.dbModuleUpdate(dbModuleExist)
-                        logger.info('module ' + dbname + ' updated')
-                    }
+                    await uploadModule(file, this.dbManager)
                 }
             }
         }
@@ -148,6 +125,38 @@ class ModuleU extends Cmd {
     }
 }
 
+/**
+ * 
+ * @param file 
+ * @param dbManager 
+ */
+export async function uploadModule(file: string, dbManager: DBManager) {
+    const dbname = getModuleDBName(file)
+    const source = fs.readFileSync(file).toString()
+    const tag = parseXML(dbname, source)
+    const dbModuleExist = await dbManager.dbModuleExist(dbname)
+    if (dbModuleExist === undefined) {
+        // insert
+        const dbModule = new DBModule()
+        dbModule.source = source
+        dbModule.dbname = dbname
+        dbModule.access = tag.attributes.ACCESS
+        dbModule.description = tag.attributes.DESCRIPTION
+        // logger.debug('module insert ' + dbname + ' access ' + dbModule.access + ' description ' + dbModule.description)
+        const id = await dbManager.dbModuleInsert(dbModule)
+        logger.info('module ' + dbname + ' added with ID ' + id)
+    }
+    else {
+        // update
+        dbModuleExist.source = source
+        dbModuleExist.access = tag.attributes.ACCESS
+        dbModuleExist.description = tag.attributes.DESCRIPTION
+        // logger.debug('module update ' + dbname + ' access ' + dbModuleExist.access + ' description ' + dbModuleExist.description)
+        await dbManager.dbModuleUpdate(dbModuleExist)
+        logger.info('module ' + dbname + ' updated')
+    }
+}
+
 interface DownloadOptions {
     id: string | undefined
     env: string | undefined

package/src/OpenCommand.ts

@@ -5,8 +5,8 @@ const logger = loglevel.getLogger('OpenCommand.ts')
 logger.setLevel('debug')
 
 export class OpenCommand extends Cmd {
-    constructor() {
-        super('open')
+    constructor(name: string) {
+        super(name)
         this.description('open browser').version('0.1')
             .argument('<module>', 'module to execute')
             .action(async (module: any, options: any) => {

package/src/RunCommand.ts

@@ -8,8 +8,8 @@ loglevel.setLevel('debug')
 const logger = loglevel.getLogger('RunCommand.ts');
 
 export class RunCommand extends Cmd {
-    constructor() {
-        super('run')
+    constructor(name: string) {
+        super(name)
         this.description('run module').version('0.2')
             .argument('<files...>', 'local module file(s) to run')
             .action(async (files: any, options: any) => {

package/src/index.ts

@@ -7,7 +7,7 @@ import { QueryCommand } from './QueryCommand'
 import { TableCommand } from './TableCommand'
 import { TestCommand } from './TestCommand'
 import { RunCommand } from './RunCommand'
-import { InitCommand } from './InitCommand'
+import { InstallCommand } from './InstallCommand'
 import { AssetCommand } from './AssetCommand'
 import { OpenCommand } from './OpenCommand'
 const logger = loglevel.getLogger("index.ts")
@@ -17,7 +17,8 @@ const program = new Command()
 program.name('cyk').description('cyklang CLI')
     .version('0.2')
 
-program.addCommand(new InitCommand('init'))
+program.addCommand(new InstallCommand('install'))
+program.addCommand(new InstallCommand('i'))
 program.addCommand(new AssetCommand('asset', 'manage assets'))
 program.addCommand(new AssetCommand('a', 'manage assets'))
 program.addCommand(new ModuleCommand('module'))
@@ -29,7 +30,9 @@ program.addCommand(new QueryCommand('q'))
 program.addCommand(new TableCommand('table'))
 program.addCommand(new TableCommand('t'))
 program.addCommand(new TestCommand())
-program.addCommand(new RunCommand())
-program.addCommand(new OpenCommand())
+program.addCommand(new RunCommand('run'))
+program.addCommand(new RunCommand('r'))
+program.addCommand(new OpenCommand('open'))
+program.addCommand(new OpenCommand('o'))
 
 program.parse()