not-node 6.1.4 → 6.1.6

package/bin/not-cli.mjs

@@ -1,421 +1,10 @@
 #!/usr/bin/env node
-const TEMPLATE_OPTIONS = "__options__";
-
-const VAR_PREFIX = "__";
-import ejs from "ejs";
-
-import { isAbsolute, resolve, join } from "node:path";
-
-import { copyFile, constants, mkdir, writeFile } from "node:fs/promises";
-
+import { Command } from "commander";
 import { cwd } from "node:process";
 const CWD = cwd();
-import { spawn } from "node:child_process";
 
-import * as url from "url";
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+import Actions from "../src/cli/actions/index.mjs";
 
-import inquirer from "inquirer";
-import { Command, Option } from "commander";
 const program = new Command();
-
-//reads vars from user input, provides defaults
-import * as Readers from "../src/cli/readers/index.mjs";
-
-import * as Renderers from "../src/cli/renderers/index.mjs";
-//file system structure
-//directories
-//files and information how to render them from which template and with what args with readers names
-import ApplicationStructure from "../tmpl/dirs/app.mjs";
-import ApplicationServerStructure from "../tmpl/dirs/server.mjs";
-import ApplicationFrontStructure from "../tmpl/dirs/front.mjs";
-import ApplicationStaticStructure from "../tmpl/dirs/static.mjs";
-
-import ApplicationModuleServerStructure from "../tmpl/dirs/module.server.mjs";
-import ApplicationModuleServerControllersCommonStructure from "../tmpl/dirs/module.server.controllers.common.mjs";
-
-import ApplicationModuleFrontStructure from "../tmpl/dirs/module.front.mjs";
-
-import { firstLetterToLower } from "../src/common.js";
-
-const ApplicationSubStructures = {
-    server: ApplicationServerStructure,
-    front: ApplicationFrontStructure,
-    static: ApplicationStaticStructure,
-    "module.server": ApplicationModuleServerStructure,
-    "module.server.controllers.common":
-        ApplicationModuleServerControllersCommonStructure,
-    "module.front": ApplicationModuleFrontStructure,
-};
-//path to various templates
-const PATH_TMPL = resolve(__dirname, "../tmpl/files");
-const DEFAULT_SERVER_MODULES_SUB_PATH = "./app/server/modules";
-const DEFAULT_FRONT_MODULES_SUB_PATH = "./app/front/src";
-
-async function readArgs(structure, config) {
-    let result = {};
-    if (Object.hasOwn(structure, "args")) {
-        for (let entry of structure.args) {
-            if (!Object.hasOwn(config, entry)) {
-                console.log(
-                    `no ${entry} in config, reading data from user input`
-                );
-                config[entry] = await Readers[entry](inquirer, config);
-            }
-            result[entry] = config[entry];
-        }
-    }
-    //console.log(JSON.stringify(result, null, 4));
-    if (Object.hasOwn(structure, "options")) {
-        result[TEMPLATE_OPTIONS] = structure.options;
-    }
-    return result;
-}
-
-async function renderFile(input, dest, data) {
-    console.log("render", dest);
-    const renderedFileContent = await ejs.renderFile(input, data, {
-        async: true,
-    });
-    await writeFile(dest, renderedFileContent);
-}
-
-async function createFileContent(filePath, structure, config) {
-    if (typeof structure == "string") {
-        await copyTmplFile(resolve(PATH_TMPL, structure), filePath);
-        return;
-    }
-    if (Object.hasOwn(structure, "tmpl")) {
-        const tmplFilePath = resolve(PATH_TMPL, structure.tmpl);
-        const data = await readArgs(structure, config);
-        await renderFile(tmplFilePath, filePath, data);
-    }
-}
-
-async function copyTmplFile(from, to) {
-    try {
-        //  console.log("cp", from, to);
-        await copyFile(from, to, constants.COPYFILE_EXCL);
-    } catch {
-        //console.error("The file could not be copied", from, to);
-    }
-}
-
-async function createDir(dirPath) {
-    try {
-        //console.log("mkdir", dirPath);
-        await mkdir(dirPath, { recursive: true });
-    } catch {
-        // console.error("Can't create directory", dirPath);
-    }
-}
-
-function isFilename(name, descr) {
-    if (descr.type === "file") {
-        return true;
-    }
-    if (name.startsWith(VAR_PREFIX) && name.endsWith(VAR_PREFIX)) {
-        return false;
-    }
-    return name.indexOf(".") > -1;
-}
-
-function isVariable(name) {
-    return name.startsWith(VAR_PREFIX) && name.endsWith(VAR_PREFIX);
-}
-
-function getVariableName(name) {
-    return name.replace(new RegExp(VAR_PREFIX, "g"), "");
-}
-
-function dirRequiresAbsentModules(subStructure, config) {
-    return (
-        Object.hasOwn(subStructure, "ifModules") &&
-        Array.isArray(subStructure.ifModules) &&
-        !subStructure.ifModules.every((entry) => config.modules.includes(entry))
-    );
-}
-
-async function createDirContent(dest, structure = {}, config = {}) {
-    if (typeof structure === "string") {
-        //console.log("need to create sub structure", structure);
-        await createDirContent(
-            dest,
-            ApplicationSubStructures[structure],
-            config
-        );
-        return;
-    }
-    const dirs = {};
-    //creating files first
-    for (let entry in structure) {
-        const subStructure = structure[entry];
-        if (isVariable(entry)) {
-            entry = config[getVariableName(entry)];
-        }
-        if (isFilename(entry, subStructure)) {
-            //  console.log(dest, entry);
-            const filePath = join(dest, entry);
-            await createFileContent(filePath, subStructure, config);
-        } else {
-            dirs[entry] = subStructure;
-        }
-    }
-    //then going deeper
-    for (let entry in dirs) {
-        const subStructure = dirs[entry];
-        const directoryPath = join(dest, entry);
-        if (dirRequiresAbsentModules(subStructure, config)) {
-            continue;
-        }
-        await createDir(directoryPath);
-        if (Object.hasOwn(subStructure, "content")) {
-            await createDirContent(directoryPath, subStructure.content, config);
-        }
-    }
-}
-
-function entitiesInLayers(layersList = []) {
-    return (
-        layersList.includes("models") ||
-        layersList.includes("routes") ||
-        layersList.includes("logics")
-    );
-}
-
-async function createLayersDirs(modules_dir, layersList, ModuleName) {
-    if (layersList.length) {
-        await createDir(resolve(modules_dir, ModuleName, "./src"));
-    }
-    for (let layer of layersList) {
-        await createDir(resolve(modules_dir, ModuleName, "./src", layer));
-    }
-}
-
-async function createServerModule(modules_dir, config) {
-    //read module name
-    const ModuleName = await Readers.ModuleName(inquirer);
-    const moduleName = firstLetterToLower(ModuleName);
-    const moduleDir = resolve(modules_dir, ModuleName);
-    const moduleConfig = { ...config, moduleName, ModuleName };
-    await createDir(moduleDir);
-    //console.log(JSON.stringify(moduleConfig, null, 4));
-    await createDirContent(
-        moduleDir,
-        ApplicationSubStructures["module.server"],
-        moduleConfig
-    );
-    const layersList = moduleConfig.moduleLayers;
-    await createLayersDirs(modules_dir, layersList, ModuleName);
-    //list of entities and its presence thru all selected layers
-    let entitiesList = [];
-    if (entitiesInLayers(layersList)) {
-        //should collect all first, to have full list of items for index files imports
-        while (await Readers.isUserNeedCreateEntity(inquirer)) {
-            const entityData = await Readers.entityData(
-                inquirer,
-                config,
-                layersList
-            );
-            entitiesList.push(entityData);
-        }
-        for (let entityData of entitiesList) {
-            await renderEntityFiles(
-                resolve(moduleDir, "./src"),
-                entityData,
-                moduleConfig
-            );
-        }
-        if (layersList.includes("controllers")) {
-            await renderServerContollersIndexes(
-                resolve(moduleDir, "./src"),
-                entitiesList,
-                moduleConfig
-            );
-            await renderServerControllersCommons(
-                resolve(moduleDir, "./src/controllers"),
-                entitiesList,
-                moduleConfig
-            );
-        }
-    }
-}
-
-async function renderEntityFiles(module_src_dir, data, config) {
-    for (let layerName of data.layers) {
-        if (Object.hasOwn(Renderers, layerName)) {
-            await Renderers[layerName](
-                resolve(module_src_dir, `./${layerName}`),
-                data,
-                config,
-                renderFile,
-                PATH_TMPL,
-                createDir
-            );
-        } else {
-            console.error("No renderer for layer: ", layerName);
-        }
-    }
-}
-
-async function renderServerContollersIndexes(
-    module_src_dir,
-    entitiesData,
-    config
-) {
-    const subDirList = [...config.roles];
-    for (let dirName of subDirList) {
-        await Renderers.controllersIndex(
-            resolve(module_src_dir, `./controllers/${dirName}`),
-            entitiesData,
-            config,
-            renderFile,
-            PATH_TMPL,
-            createDir
-        );
-    }
-}
-
-async function renderServerControllersCommons(
-    module_src_dir,
-    entitiesData,
-    config
-) {
-    const dirPath = resolve(module_src_dir, `./common`);
-    await createDir(dirPath);
-    await createDirContent(
-        dirPath,
-        ApplicationModuleServerControllersCommonStructure,
-        {}
-    );
-    await Renderers.controllersCommons(
-        dirPath,
-        entitiesData,
-        config,
-        renderFile,
-        PATH_TMPL
-    );
-}
-
-async function createBootstrapFrontModule(modules_dir, config) {
-    await createDir(modules_dir);
-    await createDirContent(
-        modules_dir,
-        ApplicationSubStructures["module.front"],
-        config
-    );
-    for (let role of config.roles) {
-        await createDir(resolve(modules_dir, role));
-        const targetFrontModuleDir = resolve(modules_dir, role, "main");
-        await createDir(targetFrontModuleDir);
-        if (role === "guest") {
-            await Renderers.frontModuleGuestMain(
-                targetFrontModuleDir,
-                { ...config, roleName: role },
-                renderFile,
-                PATH_TMPL
-            );
-        } else {
-            await Renderers.frontModuleRoleMain(
-                targetFrontModuleDir,
-                { ...config, roleName: role },
-                renderFile,
-                PATH_TMPL
-            );
-        }
-    }
-}
-
-function installPackages(opts) {
-    return new Promise((resolve, reject) => {
-        console.log("installing packages...");
-        let npmInstall = spawn(`npm`, ["i"], { cwd: opts.dir });
-
-        npmInstall.stderr.on("data", (data) => {
-            console.error(data.toString());
-        });
-        npmInstall.on("exit", (code) => {
-            if (code == 0) {
-                resolve();
-            } else {
-                reject(`NPM install exited with code ${code}`);
-            }
-        });
-    });
-}
-
-function buildClientSideScripts(opts) {
-    return new Promise((resolve, reject) => {
-        console.log("building client side scripts...");
-        let npmInstall = spawn(`npm`, ["run", "build"], { cwd: opts.dir });
-
-        npmInstall.stderr.on("data", (data) => {
-            console.error(data.toString());
-        });
-        npmInstall.on("exit", (code) => {
-            if (code == 0) {
-                resolve();
-            } else {
-                reject(`npm run build job exited with code ${code}`);
-            }
-        });
-    });
-}
-
-function postStartupInstructions(opts) {
-    console.log(
-        "Generation of source code, configurations and installation of packages successfully finished."
-    );
-    console.log(
-        `To start server navigate to directory '${opts.dir}' (cd '${opts.dir}') and run 'npm start'`
-    );
-}
-
-program
-    .command("create")
-    .addOption(
-        new Option("-d, --dir <dir>").default(CWD, "current working directory")
-    )
-    .description(
-        "create application in target directory (create -d [pathToDir])"
-    )
-    .action(async (opts) => {
-        //      console.log("create command called :" + opts.dir);
-        if (!isAbsolute(opts.dir)) {
-            opts.dir = resolve(CWD, opts.dir);
-        }
-        console.log("creating application in", opts.dir);
-        const AppConfig = {};
-        //
-        AppConfig.AppName = await Readers.AppName(inquirer, AppConfig);
-        AppConfig.appName = await Readers.appName(inquirer, AppConfig);
-        AppConfig.roles = await Readers.roles(inquirer, AppConfig);
-        AppConfig.rolesSecondary = await Readers.rolesSecondary(
-            inquirer,
-            AppConfig
-        );
-        AppConfig.modules = await Readers.modules(inquirer, AppConfig);
-        await createDir(opts.dir);
-        await createDirContent(opts.dir, ApplicationStructure, AppConfig);
-        const PATH_MODULES_SERVER = resolve(
-            opts.dir,
-            DEFAULT_SERVER_MODULES_SUB_PATH
-        );
-        const PATH_MODULES_FRONT = resolve(
-            opts.dir,
-            DEFAULT_FRONT_MODULES_SUB_PATH
-        );
-        while (await Readers.isUserNeedCreateServerModule(inquirer)) {
-            await createServerModule(PATH_MODULES_SERVER, AppConfig);
-        }
-
-        if (await Readers.isUserNeedFrontModuleBootstrap(inquirer)) {
-            await createBootstrapFrontModule(PATH_MODULES_FRONT, AppConfig);
-        }
-        console.log(`cd '${opts.dir}' && npm i`);
-        await installPackages(opts);
-        await buildClientSideScripts(opts);
-        postStartupInstructions(opts);
-    });
-
+Actions(program, { CWD });
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.1.4",
+	"version": "6.1.6",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/playground/.env

@@ -0,0 +1,16 @@
+
+NOT_NODE_ERROR_KEY=123456
+NOT_NODE_ERROR_URL_NODE=https://appmon.ru/api/key/collect
+NOT_NODE_ERROR_URL_BROWSER=https://appmon.ru/api/key/collect
+
+
+NOT_NODE_MONITOR_INTERVAL=5000
+NOT_NODE_MONITOR_REPORT_INTERVAL=60
+NOT_NODE_MONITOR_REPORT_KEY=123456
+NOT_NODE_MONITOR_REPORT_URL=https://appmon.ru/api/key/collect
+
+
+INIT_ROOT_USERNAME=root
+INIT_ROOT_EMAIL=admin@not-node-application.local
+INIT_ROOT_PASSWORD=cuPbvauK5F
+

package/playground/deploy/production.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+echo 'deploying notNodeApplication to production'
+cd site
+npm run production
+cd ../
+echo 'syncing data'
+ssh cypher@not-node-application "echo '1' > /var/server/not-node-application/deploying"
+rsync -av --progress --exclude-from='./deploy/.exclude' site cypher@not-node-application:/var/server/not-node-application/
+rsync -av --progress deploy/production.json cypher@not-node-application:/var/server/not-node-application/pm2/production.json
+ssh cypher@not-node-application "cd /var/server/not-node-application/site && npm i"
+ssh cypher@not-node-application "cd /var/server/not-node-application && pm2 startOrRestart pm2/production.json"
+ssh cypher@not-node-application "rm /var/server/not-node-application/deploying"
+exit 0;

package/playground/deploy/stage.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+echo 'deploying notNodeApplication to stage'
+cd site
+npm run stage
+cd ../
+echo 'syncing data'
+ssh cypher@stage.not-node-application "echo '1' > /var/server/not-node-application/deploying"
+rsync -av --progress --exclude-from='./deploy/.exclude' site cypher@stage.not-node-application:/var/server/not-node-application/
+rsync -av --progress deploy/stage.json cypher@stage.not-node-application:/var/server/not-node-application/pm2/stage.json
+ssh cypher@stage.not-node-application "cd /var/server/not-node-application/site && npm i"
+ssh cypher@stage.not-node-application "cd /var/server/not-node-application && pm2 startOrRestart pm2/stage.json"
+ssh cypher@stage.not-node-application "rm /var/server/not-node-application/deploying"
+exit 0;

package/playground/nginx/development.conf

@@ -0,0 +1,55 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream websocket2 {
+    server :;
+}
+
+server {
+    listen 80  ssl   http2   ;
+    root /var/server/nn/playground/site/app/static;
+    index index.html index.htm;
+    server_name not-node-application.local;
+    
+    location /assets/{expires 365d; alias /var/server/nn/playground/site/app/static/assets/;}	
+    location /css/{	expires 365d; alias /var/server/nn/playground/site/app/static/css/;}	
+    location /js/{	expires 365d;alias /var/server/nn/playground/site/app/static/js/;	}
+    location /img/{	expires 365d;alias /var/server/nn/playground/site/app/static/img/;}
+    location /webfonts/{	expires 365d;alias /var/server/nn/playground/site/app/static/webfonts/;	}
+    location /favicon.ico {	expires 365d;alias /var/server/nn/playground/site/app/static/favicon.ico;	}
+    location /sitemap.xml {	expires 1d; alias /var/server/nn/playground/site/app/static/sitemap.xml;	}
+    location /robots.txt {	expires 365d;alias /var/server/nn/playground/site/app/static/robots.txt;	}
+    location /manifest.webmaniest {	expires 365d;alias /var/server/nn/playground/site/app/static/manifest.webmaniest;	}
+
+
+    location /api {
+        expires -1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://not-node-application.local:3000/api;
+    }
+
+    
+
+
+    location / {		
+        expires 365d;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://not-node-application.local:3000/;
+    }
+
+    
+    listen 443 ssl  http2   ;
+    
+}

package/playground/nginx/production.conf

@@ -0,0 +1,55 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream websocket2 {
+    server :;
+}
+
+server {
+    listen 80  ssl   http2   ;
+    root /var/server/not-node-application/site/app/static;
+    index index.html index.htm;
+    server_name not-node-application;
+    
+    location /assets/{expires 365d; alias /var/server/not-node-application/site/app/static/assets/;}	
+    location /css/{	expires 365d; alias /var/server/not-node-application/site/app/static/css/;}	
+    location /js/{	expires 365d;alias /var/server/not-node-application/site/app/static/js/;	}
+    location /img/{	expires 365d;alias /var/server/not-node-application/site/app/static/img/;}
+    location /webfonts/{	expires 365d;alias /var/server/not-node-application/site/app/static/webfonts/;	}
+    location /favicon.ico {	expires 365d;alias /var/server/not-node-application/site/app/static/favicon.ico;	}
+    location /sitemap.xml {	expires 1d; alias /var/server/not-node-application/site/app/static/sitemap.xml;	}
+    location /robots.txt {	expires 365d;alias /var/server/not-node-application/site/app/static/robots.txt;	}
+    location /manifest.webmaniest {	expires 365d;alias /var/server/not-node-application/site/app/static/manifest.webmaniest;	}
+
+
+    location /api {
+        expires -1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://not-node-application:3000/api;
+    }
+
+    
+
+
+    location / {		
+        expires 365d;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://not-node-application:3000/;
+    }
+
+    
+    listen 443 ssl  http2   ;
+    
+}

package/playground/nginx/stage.conf

@@ -0,0 +1,55 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream websocket2 {
+    server :;
+}
+
+server {
+    listen 80  ssl   http2   ;
+    root /var/server/not-node-application/site/app/static;
+    index index.html index.htm;
+    server_name stage.not-node-application;
+    
+    location /assets/{expires 365d; alias /var/server/not-node-application/site/app/static/assets/;}	
+    location /css/{	expires 365d; alias /var/server/not-node-application/site/app/static/css/;}	
+    location /js/{	expires 365d;alias /var/server/not-node-application/site/app/static/js/;	}
+    location /img/{	expires 365d;alias /var/server/not-node-application/site/app/static/img/;}
+    location /webfonts/{	expires 365d;alias /var/server/not-node-application/site/app/static/webfonts/;	}
+    location /favicon.ico {	expires 365d;alias /var/server/not-node-application/site/app/static/favicon.ico;	}
+    location /sitemap.xml {	expires 1d; alias /var/server/not-node-application/site/app/static/sitemap.xml;	}
+    location /robots.txt {	expires 365d;alias /var/server/not-node-application/site/app/static/robots.txt;	}
+    location /manifest.webmaniest {	expires 365d;alias /var/server/not-node-application/site/app/static/manifest.webmaniest;	}
+
+
+    location /api {
+        expires -1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://stage.not-node-application:3000/api;
+    }
+
+    
+
+
+    location / {		
+        expires 365d;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass http://stage.not-node-application:3000/;
+    }
+
+    
+    listen 443 ssl  http2   ;
+    
+}

package/playground/pm2/development.json

@@ -0,0 +1,46 @@
+{
+	"apps": [
+		{
+			"name": "not-node-application.development",
+			"script": "./site/app/server/index.js",
+			"node_args": [
+				"--stack-trace-limit=50",
+                
+				"--inspect=3002"
+                
+			],
+			"watch": true,
+			"ignore_watch": [
+				"./site/node_modules",
+				"./site/docs",
+				"./site/app/static",
+				"./site/app/front/build",
+				"./db.dumps"
+			],
+			"exec_mode": "fork",
+			"env": {
+				"hostname": "https://not-node-application.local",
+				"NODE_ENV": "development",
+                
+				"NOT_NODE_ERROR_KEY": "123456",
+				"NOT_NODE_ERROR_URL_NODE": "https://appmon.ru/api/key/collect",
+				"NOT_NODE_ERROR_URL_BROWSER": "https://appmon.ru/api/key/collect",
+                
+                
+				"NOT_NODE_MONITOR_INTERVAL": 5000,
+				"NOT_NODE_MONITOR_REPORT_INTERVAL": 60,
+				"NOT_NODE_MONITOR_REPORT_KEY": "123456",
+				"NOT_NODE_MONITOR_REPORT_URL": "https://appmon.ru/api/key/collect"
+                
+                               
+				"db__mongoose__uri": "mongodb:///test?authSource=admin",
+                "db__mongoose__options__host": "",
+				"db__mongoose__options__user": "tester",
+				"db__mongoose__options__pass": "test",
+				"db__mongoose__options__db": "test",
+                
+				
+			}
+		}
+	]
+}