@modern-js/app-tools 1.22.1 → 2.0.0-alpha.0

package/dist/js/treeshaking/utils/printInstructions.js

@@ -0,0 +1,152 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { prettyInstructions, logger } from "@modern-js/utils";
+var printInstructions = function() {
+    var _ref = _asyncToGenerator(function(hookRunners, appContext, config) {
+        var message, instructions;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    message = prettyInstructions(appContext, config);
+                    return [
+                        4,
+                        hookRunners.beforePrintInstructions({
+                            instructions: message
+                        })
+                    ];
+                case 1:
+                    instructions = _state.sent().instructions;
+                    logger.info(instructions);
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function printInstructions(hookRunners, appContext, config) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { printInstructions };

package/dist/js/treeshaking/utils/restart.js

@@ -0,0 +1,187 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { cli } from "@modern-js/core";
+import { chalk, clearConsole, logger, program } from "@modern-js/utils";
+function restart(hooksRunner, filename) {
+    return _restart.apply(this, arguments);
+}
+function _restart() {
+    _restart = _asyncToGenerator(function(hooksRunner, filename) {
+        var hasGetError, err;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    clearConsole();
+                    logger.info("Restart because ".concat(chalk.yellow(filename), " is changed...\n"));
+                    hasGetError = false;
+                    return [
+                        4,
+                        hooksRunner.beforeRestart()
+                    ];
+                case 1:
+                    _state.sent();
+                    _state.label = 2;
+                case 2:
+                    _state.trys.push([
+                        2,
+                        4,
+                        5,
+                        6
+                    ]);
+                    return [
+                        4,
+                        cli.init(cli.getPrevInitOptions())
+                    ];
+                case 3:
+                    _state.sent();
+                    return [
+                        3,
+                        6
+                    ];
+                case 4:
+                    err = _state.sent();
+                    console.error(err);
+                    hasGetError = true;
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    if (!hasGetError) {
+                        program.parse(process.argv);
+                    }
+                    return [
+                        7
+                    ];
+                case 6:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _restart.apply(this, arguments);
+}
+export { restart };

package/dist/js/treeshaking/utils/routes.js

@@ -0,0 +1,153 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import path from "path";
+import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
+var generateRoutes = function() {
+    var _ref = _asyncToGenerator(function(appContext) {
+        var serverRoutes, distDirectory, output;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    serverRoutes = appContext.serverRoutes, distDirectory = appContext.distDirectory;
+                    output = JSON.stringify({
+                        routes: serverRoutes
+                    }, null, 2);
+                    return [
+                        4,
+                        fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output)
+                    ];
+                case 1:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function generateRoutes(appContext) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { generateRoutes };

package/dist/js/treeshaking/utils/types.js

@@ -0,0 +1 @@
+"use strict";

package/dist/types/analyze/Builder.d.ts

@@ -0,0 +1,8 @@
+import type { BuildOptions } from 'esbuild';
+export declare class Builder {
+  private buildRes;
+  build(options: BuildOptions): Promise<void>;
+  stop(): void;
+}
+export declare const loaderBuilder: Builder;
+export declare const serverLoaderBuilder: Builder;

package/dist/types/analyze/constants.d.ts

@@ -2,7 +2,10 @@ export declare const JS_EXTENSIONS: string[];
 export declare const INDEX_FILE_NAME = "index";
 export declare const APP_FILE_NAME = "App";
 export declare const PAGES_DIR_NAME = "pages";
+export declare const NESTED_ROUTES_DIR = "routes";
 export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+export declare const LOADER_EXPORT_NAME = "loader";
+export declare const TEMP_LOADERS_DIR = "__loaders__";
 export declare const ENTRY_POINT_FILE_NAME = "index.js";
 export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
 export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;
@@ -12,4 +15,13 @@ export declare const FILE_SYSTEM_ROUTES_INDEX = "index";
 export declare const FILE_SYSTEM_ROUTES_IGNORED_REGEX: RegExp;
 export declare const HTML_PARTIALS_FOLDER = "html";
 export declare const HTML_PARTIALS_EXTENSIONS: string[];
-export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+export declare const NESTED_ROUTE: {
+  LAYOUT_FILE: string;
+  LAYOUT_LOADER_FILE: string;
+  PAGE_FILE: string;
+  PAGE_LOADER_FILE: string;
+  LOADING_FILE: string;
+  ERROR_FILE: string;
+  LOADER_FILE: string;
+};

package/dist/types/analyze/generateCode.d.ts

@@ -1,4 +1,5 @@
-import type { IAppContext, NormalizedConfig, PluginAPI, ImportStatement } from '@modern-js/core';
+import { IAppContext, PluginAPI } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
+import { AppNormalizedConfig, AppTools, ImportStatement } from '../types';
 export declare const createImportStatements: (statements: ImportStatement[]) => string;
-export declare const generateCode: (appContext: IAppContext, config: NormalizedConfig, entrypoints: Entrypoint[], api: PluginAPI) => Promise<void>;
+export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig, entrypoints: Entrypoint[], api: PluginAPI<AppTools>) => Promise<void>;

package/dist/types/analyze/getBundleEntry.d.ts

@@ -1,3 +1,3 @@
-import type { IAppContext, NormalizedConfig } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-export declare const getBundleEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];
+import type { AppNormalizedConfig, IAppContext } from '../types';
+export declare const getBundleEntry: (appContext: IAppContext, config: AppNormalizedConfig) => Entrypoint[];

package/dist/types/analyze/{getClientRoutes.d.ts → getClientRoutes/getRoutes.d.ts}

@@ -1,9 +1,4 @@
-import type { Entrypoint, Route } from '@modern-js/types';
-export type { Route };
-export interface Identifier {
-  name: string;
-  path: string;
-}
+import type { Entrypoint, NestedRoute, PageRoute } from '@modern-js/types';
 export declare const getClientRoutes: ({
   entrypoint,
   srcDirectory,
@@ -16,4 +11,4 @@ export declare const getClientRoutes: ({
   srcAlias: string;
   internalDirectory: string;
   internalDirAlias: string;
-}) => Route[];
+}) => (NestedRoute | PageRoute)[];

package/dist/types/analyze/getClientRoutes/getRoutesLegacy.d.ts

@@ -0,0 +1,15 @@
+import type { Entrypoint, RouteLegacy } from '@modern-js/types';
+export type { RouteLegacy as Route };
+export declare const getClientRoutes: ({
+  entrypoint,
+  srcDirectory,
+  srcAlias,
+  internalDirectory,
+  internalDirAlias
+}: {
+  entrypoint: Entrypoint;
+  srcDirectory: string;
+  srcAlias: string;
+  internalDirectory: string;
+  internalDirAlias: string;
+}) => RouteLegacy[];

package/dist/types/analyze/getClientRoutes/index.d.ts

@@ -0,0 +1,2 @@
+export { getClientRoutes } from './getRoutes';
+export { getClientRoutes as getClientRoutesLegacy } from './getRoutesLegacy';

package/dist/types/analyze/getClientRoutes/utils.d.ts

@@ -0,0 +1,5 @@
+declare const debug: import("@modern-js/utils/compiled/debug").Debugger;
+export { debug };
+export declare const findLayout: (dir: string) => string | false;
+export declare const getRouteWeight: (route: string) => number;
+export declare const shouldSkip: (file: string) => boolean;

package/dist/types/analyze/getFileSystemEntry.d.ts

@@ -1,4 +1,4 @@
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
+import type { AppNormalizedConfig, IAppContext } from '../types';
 export type { Entrypoint };
-export declare const getFileSystemEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];
+export declare const getFileSystemEntry: (appContext: IAppContext, config: AppNormalizedConfig) => Entrypoint[];

package/dist/types/analyze/getHtmlTemplate.d.ts

@@ -1,9 +1,9 @@
-import type { IAppContext, NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { Entrypoint, HtmlTemplates } from '@modern-js/types';
-export declare const getHtmlTemplate: (entrypoints: Entrypoint[], api: PluginAPI, {
+import type { AppNormalizedConfig, AppTools, IAppContext, PluginAPI } from '../types';
+export declare const getHtmlTemplate: (entrypoints: Entrypoint[], api: PluginAPI<AppTools>, {
   appContext,
   config
 }: {
   appContext: IAppContext;
-  config: NormalizedConfig;
+  config: AppNormalizedConfig;
 }) => Promise<HtmlTemplates>;

package/dist/types/analyze/getServerRoutes.d.ts

@@ -1,9 +1,10 @@
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type { IAppContext } from '@modern-js/core';
 import type { Entrypoint, ServerRoute } from '@modern-js/types';
+import type { AppNormalizedConfig } from '../types';
 export declare const getServerRoutes: (entrypoints: Entrypoint[], {
   appContext,
   config
 }: {
   appContext: IAppContext;
-  config: NormalizedConfig;
+  config: AppNormalizedConfig;
 }) => ServerRoute[];

package/dist/types/analyze/index.d.ts

@@ -1,43 +1,6 @@
-import type { CliPlugin, RuntimePlugin, ImportStatement } from '@modern-js/core';
-import type { Route, Entrypoint, ServerRoute, HtmlPartials } from '@modern-js/types';
-export declare const modifyEntryImports: import("@modern-js/plugin").AsyncWaterfall<{
-  imports: ImportStatement[];
-  entrypoint: Entrypoint;
-}>;
-export declare const modifyEntryExport: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  exportStatement: string;
-}>;
-export declare const addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
-export declare const modifyEntryRuntimePlugins: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  plugins: RuntimePlugin[];
-}>;
-export declare const modifyEntryRenderFunction: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  code: string;
-}>;
-export declare const modifyAsyncEntry: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  code: string;
-}>;
-export declare const modifyFileSystemRoutes: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  routes: Route[];
-}>;
-export declare const modifyServerRoutes: import("@modern-js/plugin").AsyncWaterfall<{
-  routes: ServerRoute[];
-}>;
-export declare const htmlPartials: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  partials: HtmlPartials;
-}>;
-export declare const beforeGenerateRoutes: import("@modern-js/plugin").AsyncWaterfall<{
-  entrypoint: Entrypoint;
-  code: string;
-}>;
-export declare const addDefineTypes: import("@modern-js/plugin").AsyncWaterfall<void>;
+import type { CliPlugin } from '@modern-js/core';
+import { AppTools } from '../types';
 
-declare const _default: () => CliPlugin;
+declare const _default: () => CliPlugin<AppTools>;
 
 export default _default;

package/dist/types/analyze/nestedRoutes.d.ts

@@ -0,0 +1,5 @@
+import type { NestedRoute } from '@modern-js/types';
+export declare const walk: (dirname: string, rootDir: string, alias: {
+  name: string;
+  basename: string;
+}, entryName: string) => Promise<NestedRoute | null>;