lincd-cli 1.2.0 → 1.2.1

package/lib/cjs/cli-methods.js

@@ -15,18 +15,32 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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.removeOldFiles = exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = 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.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = 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.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.warn = warn;
+exports.developPackage = developPackage;
+exports.buildAll = buildAll;
+exports.getLincdPackages = getLincdPackages;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const depcheck_1 = __importDefault(require("depcheck"));
@@ -44,6 +58,8 @@ const glob_1 = require("glob");
 const webpack_1 = __importDefault(require("webpack"));
 const staged_git_files_1 = __importDefault(require("staged-git-files"));
 const ora_1 = __importDefault(require("ora"));
+//@ts-ignore
+let dirname__ = typeof __dirname !== 'undefined' ? __dirname : (0, path_1.dirname)(import.meta.url).replace('file:/', '');
 var variables = {};
 const createApp = async (name, basePath = process.cwd()) => {
     if (!name) {
@@ -54,7 +70,7 @@ const createApp = async (name, basePath = process.cwd()) => {
     if (!fs_extra_1.default.existsSync(targetFolder)) {
         fs_extra_1.default.mkdirSync(targetFolder);
     }
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-with-backend'), targetFolder);
+    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_extra_1.default.mkdirSync(path_1.default.join(targetFolder, 'data/uploads/resized'), {
@@ -94,7 +110,6 @@ function warn(...messages) {
         // console.log(chalk.red(message));
     });
 }
-exports.warn = warn;
 function developPackage(target, mode) {
     if (!target)
         target = 'es6';
@@ -120,7 +135,6 @@ function developPackage(target, mode) {
         console.warn('unknown build target. Use es5 or es6');
     }
 }
-exports.developPackage = developPackage;
 function checkWorkspaces(rootPath, workspaces, res) {
     // console.log('checking workspaces at '+rootPath+": "+workspaces.toString());
     if (workspaces.packages) {
@@ -546,7 +560,6 @@ function buildAll(options) {
         }
     }, sync);
 }
-exports.buildAll = buildAll;
 function getDependentPackages(dependencies, pkg) {
     let dependentModules = [];
     dependencies.forEach((dModuleDependencies, dModule) => {
@@ -597,7 +610,6 @@ function getLincdPackages(rootPath = process.cwd()) {
     checkWorkspaces(rootPath, pack.workspaces, res);
     return res;
 }
-exports.getLincdPackages = getLincdPackages;
 function setVariable(name, replacement) {
     //prepare name for regexp
     name = name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
@@ -645,18 +657,18 @@ const createOntology = async (prefix, uriBase, basePath = process.cwd()) => {
     //copy ontology accessor file
     log('Creating files for ontology \'' + prefix + '\'');
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'ontologies', 'example-ontology.ts'), targetFile);
     //copy data files
     let targetDataFile = path_1.default.join(targetFolder, '..', 'data', hyphenName + '.json');
     let targetDataFile2 = path_1.default.join(targetFolder, '..', 'data', hyphenName + '.json.d.ts');
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json'), targetDataFile);
-    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json.d.ts'), targetDataFile2);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json'), targetDataFile);
+    fs_extra_1.default.copySync(path_1.default.join(dirname__, '..', '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json.d.ts'), targetDataFile2);
     await replaceVariablesInFiles(targetFile, targetDataFile, targetDataFile2);
     log(`Prepared a new ontology data files in ${chalk_1.default.magenta(targetDataFile.replace(basePath, ''))}`, `And an ontology accessor file in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`);
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
         //then also add an import to index
-        let indexPath = addLineToIndex(`import './ontologies/${hyphenName}';`, 'ontologies');
+        let indexPath = addLineToIndex(`import './ontologies/${hyphenName}.js';`, 'ontologies');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
@@ -778,15 +790,18 @@ function getSourceFolder(basePath = process.cwd()) {
  * get __dirname for either ESM/CJS
  */
 const getScriptDir = () => {
-    // @ts-ignore
-    if (typeof __dirname !== 'undefined') {
-        // @ts-ignore
-        return __dirname;
-    }
-    else {
-        // @ts-ignore
-        return (0, path_1.dirname)(import.meta.url).replace('file:/', '');
-    }
+    return dirname__;
+    // // @ts-ignore
+    // if (typeof __dirname !== 'undefined')
+    // {
+    //   // @ts-ignore
+    //   return __dirname;
+    // }
+    // else
+    // {
+    //   // @ts-ignore
+    //   return dirname(import.meta.url).replace('file:/','');
+    // }
 };
 exports.getScriptDir = getScriptDir;
 const createShape = async (name, basePath = process.cwd()) => {
@@ -803,7 +818,7 @@ const createShape = async (name, basePath = process.cwd()) => {
     //if this is NOT a lincd app (but a lincd package)
     let indexPath;
     if (!sourceFolder.includes('frontend')) {
-        indexPath = addLineToIndex(`import './shapes/${hyphenName}';`, 'shapes');
+        indexPath = addLineToIndex(`import './shapes/${hyphenName}.js';`, 'shapes');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
@@ -819,7 +834,7 @@ const createSetComponent = async (name, basePath = process.cwd()) => {
     fs_extra_1.default.copySync(path_1.default.join((0, exports.getScriptDir)(), '..', '..', 'defaults', 'component.scss'), targetFile2);
     //replace variables in some of the copied files
     await replaceVariablesInFiles(targetFile, targetFile2);
-    let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
+    let indexPath = addLineToIndex(`import './components/${hyphenName}.js';`, 'components');
     log(`Created a new set component in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`, `Created a new stylesheet in ${chalk_1.default.magenta(targetFile2.replace(basePath, ''))}`, `Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
 };
 exports.createSetComponent = createSetComponent;
@@ -839,15 +854,15 @@ const createComponent = async (name, basePath = process.cwd()) => {
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
         //then also add an import to index
-        let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
+        let indexPath = addLineToIndex(`import './components/${hyphenName}.js';`, 'components');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
 };
 exports.createComponent = createComponent;
 //read the source of all ts/tsx files in the src folder
 //if there is an import that imports a lincd package with /src/ in it, then warn
-//if there is an import that imports outside of the src folder, then warn
-const checkImports = async (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside of the src folder
+//if there is an import that imports something from outside the src folder, then warn
+const checkImports = async (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside the src folder
 invalidImports = new Map()) => {
     const dir = fs_extra_1.default.readdirSync(sourceFolder);
     // Start checking each file in the source folder
@@ -857,40 +872,66 @@ invalidImports = new Map()) => {
         // INFO: For future use - if this part fails, it could be due to user permissions
         //  i.e. the program not having access to check the file metadata
         if (!filename.match(/\.tsx?$/)) {
-            if ((0, fs_1.statSync)(filename).isDirectory()) {
-                await (0, exports.checkImports)(filename, depth + 1, invalidImports);
+            try {
+                if ((0, fs_1.statSync)(filename).isDirectory()) {
+                    await (0, exports.checkImports)(filename, depth + 1, invalidImports);
+                }
+                else {
+                    // Ignore all files that aren't one of the following:
+                    // - .ts
+                    // - .tsx
+                    continue;
+                }
+            }
+            catch (e) {
+                console.log(e);
             }
-            // Ignore all files that aren't one of the following:
-            // - .ts
-            // - .tsx
-            continue;
         }
         const allImports = await (0, utils_js_1.getFileImports)(filename);
-        const lincdImports = allImports.filter((i) => i.includes('lincd') || i.includes('..'));
-        lincdImports.forEach((i) => {
-            if (!(0, utils_js_1.isValidLINCDImport)(i, depth)) {
-                if (!invalidImports.has(filename)) {
-                    invalidImports.set(filename, []);
-                }
-                invalidImports.get(filename).push(i);
+        if (!invalidImports.has(filename)) {
+            invalidImports.set(filename, []);
+        }
+        allImports.forEach((i) => {
+            if ((0, utils_js_1.isImportOutsideOfPackage)(i, depth)) {
+                invalidImports.get(filename).push({
+                    type: 'outside_package',
+                    importPath: i
+                });
+            }
+            if ((0, utils_js_1.isInvalidLINCDImport)(i, depth)) {
+                invalidImports.get(filename).push({
+                    type: 'lincd',
+                    importPath: i
+                });
+            }
+            if ((0, utils_js_1.isImportWithMissingExtension)(i)) {
+                invalidImports.get(filename).push({
+                    type: 'missing_extension',
+                    importPath: i
+                });
             }
         });
     }
     let res = '';
+    //check if invalidImports has any
+    let flat = [...invalidImports.values()].flat();
     // All recursion must have finished, display any errors
-    if (depth === 0 && invalidImports.size > 0) {
+    if (depth === 0 && flat.length > 0) {
         res += chalk_1.default.red('Invalid imports found.\n');
         invalidImports.forEach((value, key) => {
             // res += '- '+chalk.blueBright(key.split('/').pop()) + ':\n';
-            value.forEach((i) => {
-                res += chalk_1.default.red(key.split('/').pop() + ' imports from \'' + i + '\'\n');
-                if (i.indexOf('../../') === 0) {
-                    res +=
-                        'To fix: import from the NPM package directly.\n';
+            value.forEach(({ type, importPath }) => {
+                let message = key.split('/').pop() + ' imports from \'' + importPath + '\'';
+                if (type === 'outside_package') {
+                    message += ' which is outside the package source root';
                 }
-                else if ('/src/') {
-                    res += 'To fix: you likely need to replace /src with /lib\n';
+                if (type === 'lincd') {
+                    message += ' which should not contain /src/ or /lib/ in the import path';
                 }
+                if (type === 'missing_extension') {
+                    message += ' which should end with a file extension. Like .js or .scss';
+                }
+                res += chalk_1.default.red(message + '\n');
             });
         });
         throw res;
@@ -1015,9 +1056,8 @@ const ensureEnvironmentLoaded = async () => {
 };
 exports.ensureEnvironmentLoaded = ensureEnvironmentLoaded;
 const startServer = async (initOnly = false, ServerClass = null) => {
-    var _a, _b;
     await (0, exports.ensureEnvironmentLoaded)();
-    let lincdConfig = await (_a = path_1.default.join(process.cwd(), 'lincd.config.js'), Promise.resolve().then(() => __importStar(require(_a))));
+    let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s)))).default;
     // function scssLoadcall(source, filename) {
     //   return 'console.log("SCSS CALL: ' + filename + '");\n' + source;
     //   process.exit();
@@ -1032,9 +1072,9 @@ const startServer = async (initOnly = false, ServerClass = null) => {
         //@ts-ignore
         ServerClass = (await Promise.resolve().then(() => __importStar(require('lincd-server/shapes/LincdServer')))).LincdServer;
     }
-    await (_b = path_1.default.join(process.cwd(), 'scripts', 'storage-config.js'), Promise.resolve().then(() => __importStar(require(_b))));
+    await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
     let server = new ServerClass({
-        loadAppComponent: async () => { var _a; return (await (_a = path_1.default.join(process.cwd(), 'src', 'App'), Promise.resolve().then(() => __importStar(require(_a))))).default; },
+        loadAppComponent: async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default,
         ...lincdConfig,
     });
     //Important to use slice, because when using clusers, child processes need to be able to read the same arguments
@@ -1086,7 +1126,6 @@ const buildApp = async () => {
             // process.exit();
         });
     }).then(async () => {
-        var _a;
         // make sure environment is not development for storage config
         // 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) {
@@ -1098,7 +1137,7 @@ const buildApp = async () => {
             process.exit();
         }
         // load the storage config
-        const storageConfig = await (_a = path_1.default.join(process.cwd(), 'scripts', 'storage-config.js'), Promise.resolve().then(() => __importStar(require(_a))));
+        const storageConfig = await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
         // check if LincdFileStorage has a default FileStore
         // if yes: copy all the files in the build folder over with LincdFileStorage
         if (LinkedFileStorage_1.LinkedFileStorage.getDefaultStore()) {
@@ -1411,25 +1450,30 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
         //TODO: replace with listr so we can show multiple processes at once
         spinner = (0, ora_1.default)({
             discardStdin: true,
-            text: 'Compiling code',
+            text: 'Compiling ESM',
         }).start();
     }
     let buildProcess = Promise.resolve(true);
     let buildStep = (step) => {
         buildProcess = buildProcess.then((previousResult) => {
+            if (!previousResult) {
+                return false;
+            }
             if (logResults) {
                 spinner.text = step.name;
                 spinner.start();
             }
             return step.apply().then(stepResult => {
+                //if a build step returns a string,
+                //a warning is shown but the build is still successful with warnings
                 if (typeof stepResult === 'string') {
                     // spinner.text = step.name + ' - ' + stepResult;
                     if (logResults) {
                         spinner.warn(step.name + ' - ' + stepResult);
                         spinner.stop();
                     }
-                    //warning is shown, but build is still succesful with warnings
-                    return false;
+                    //can still continue
+                    return true;
                 }
                 else if (stepResult === true || typeof stepResult === 'undefined') {
                     if (logResults) {
@@ -1437,13 +1481,27 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
                     }
                     return previousResult && true;
                 }
+                else if (typeof stepResult === 'object' && stepResult.error) {
+                    if (logResults) {
+                        spinner.fail(step.name + ' - ' + stepResult.error);
+                        spinner.stop();
+                    }
+                    //failed and should stop
+                    return false;
+                }
             });
         });
     };
     buildStep({
-        name: 'Compiling code',
+        name: 'Compiling ESM',
+        apply: async () => {
+            return (0, exports.compilePackageESM)(packagePath);
+        },
+    });
+    buildStep({
+        name: 'Compiling CJS',
         apply: async () => {
-            return (0, exports.compilePackage)(packagePath);
+            return (0, exports.compilePackageCJS)(packagePath);
         },
     });
     buildStep({
@@ -1489,20 +1547,21 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
         apply: () => (0, exports.depCheck)(packagePath),
     });
     let success = await buildProcess.catch(err => {
-        let msg = err.error ? 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('✖'),
-                text: 'Build failed',
+                // text: 'Build failed',
             });
         }
         else {
             console.log(chalk_1.default.red(packagePath.split('/').pop(), ' - Build failed:'));
+            console.log(err);
         }
         console.log(msg);
     });
     //will be undefined if there was an error
-    if (typeof success !== 'undefined') {
+    if (typeof success !== 'undefined' && success !== false) {
         if (logResults) {
             spinner.stopAndPersist({
                 symbol: chalk_1.default.greenBright('✔'),
@@ -1510,33 +1569,61 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
             });
         }
     }
+    else {
+        spinner.stopAndPersist({
+            symbol: chalk_1.default.red('✖'),
+            text: 'Build failed',
+        });
+    }
     return success;
 };
 exports.buildPackage = buildPackage;
 const compilePackage = async (packagePath = process.cwd()) => {
     //echo 'compiling CJS' && tsc -p tsconfig-cjs.json && echo 'compiling ESM' && tsc -p tsconfig-esm.json
-    let cjsConfig = fs_extra_1.default.existsSync(path_1.default.join(packagePath, 'tsconfig-cjs.json'));
-    let esmConfig = fs_extra_1.default.existsSync(path_1.default.join(packagePath, 'tsconfig-esm.json'));
-    let compileCJS = `yarn exec tsc -p tsconfig-cjs.json`;
-    let compileESM = `yarn exec tsc -p tsconfig-esm.json`;
-    let compileCommand;
-    if (cjsConfig && esmConfig) {
-        compileCommand = `${compileCJS} && ${compileESM}`;
-    }
-    else if (cjsConfig) {
-        compileCommand = compileCJS;
-    }
-    else if (esmConfig) {
-        compileCommand = compileESM;
-    }
-    else {
-        compileCommand = `yarn exec tsc`;
-    }
+    // let cjsConfig = fs.existsSync(path.join(packagePath,'tsconfig-cjs.json'));
+    // let esmConfig = fs.existsSync(path.join(packagePath,'tsconfig-esm.json'));
+    // let compileCJS = `yarn exec tsc -p tsconfig-cjs.json`;
+    // let compileESM = `yarn exec tsc -p tsconfig-esm.json`;
+    // let compileCommand;
+    // if (cjsConfig && esmConfig)
+    // {
+    //   compileCommand = `${compileCJS} && ${compileESM}`;
+    // }
+    // else if (cjsConfig)
+    // {
+    //   compileCommand = compileCJS;
+    // }
+    // else if (esmConfig)
+    // {
+    //   compileCommand = compileESM;
+    // }
+    // else
+    // {
+    //   compileCommand = `yarn exec tsc`;
+    // }
+    await (0, exports.compilePackageESM)(packagePath);
+    await (0, exports.compilePackageCJS)(packagePath);
+};
+exports.compilePackage = compilePackage;
+const compilePackageESM = async (packagePath = process.cwd()) => {
+    //echo 'compiling CJS' && tsc -p tsconfig-cjs.json && echo 'compiling ESM' && tsc -p tsconfig-esm.json
+    let compileCommand = `yarn exec tsc -p tsconfig-esm.json`;
     return (0, utils_js_1.execPromise)(compileCommand, false, false, { cwd: packagePath }).then(res => {
         return res === '';
     });
 };
-exports.compilePackage = compilePackage;
+exports.compilePackageESM = compilePackageESM;
+const compilePackageCJS = async (packagePath = process.cwd()) => {
+    let compileCommand = `yarn exec tsc -p tsconfig-cjs.json`;
+    return (0, utils_js_1.execPromise)(compileCommand, false, false, { cwd: packagePath }).then(res => {
+        return res === '';
+    }).catch(err => {
+        return {
+            error: err.stdout
+        };
+    });
+};
+exports.compilePackageCJS = compilePackageCJS;
 var publishUpdated = function (test = false) {
     let packages = getLocalLincdModules();
     var p = Promise.resolve('');
@@ -1800,7 +1887,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);
                     }
                 })
@@ -1960,6 +2047,8 @@ var executeCommandForPackage = function (packageName, command) {
             ' && yarn exec 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' +