tungsten 0.2.1 → 0.2.3

package/dist/Framework.js

@@ -0,0 +1,280 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+//import slash from 'slash'
+import rmfr from 'rmfr';
+import { join } from 'path';
+import { filter as objectFilter, remap as objectRemap } from 'sxy-lib/objects.js';
+import { buildCodeSubPath, buildFolder, devBuildOuterFolder, prodBuildFolder, prodBuildCodeFolder, bundleFolder, staticSiteFolder } from "./settings.js";
+import { DevServer } from "./Servers/DevServer.js";
+import { ProdServer } from "./Servers/ProdServer.js";
+import { compileUserApp } from "./build/compileUserApp.js";
+import { getAllTungstenClientModules } from "./build/getAllSxyClientModules.js";
+import { getTungstenClientPackageAliases } from "./build/getSxyClientPackageAliases.js";
+import { createInstanceConfigFile } from "./build/createInstanceConfigFile.js";
+import { createClientFiles } from "./build/createClientFiles.js";
+import { bundle } from "./build/bundle.js";
+import { TungstenError } from "./TungstenError.js";
+import { cliNews, cliOut } from "./cliOutput.js";
+import { staticGen } from "./staticGen/staticGen.js";
+import { throwError } from "./throwError.js";
+//import { devBundle } from './build/devBundle.jsx'
+import { existsSync, readFileSync, openSync, closeSync, writeFileSync, copyFileSync } from 'fs';
+import { parseIni } from "./parseIni.js";
+import { getEnvSchemas } from "./env/getEnvSchemas.js";
+import { injectEnv } from "./env/injectEnv.js";
+//import { ValueOf } from 'sxy-lib'
+import { windowGlobalEnvStatement } from "./env/windowGlobalEnvStatement.js";
+import { loadEnvsDev } from "./Servers/loadEnvsDev.js";
+import { getUserConfig } from "./getUserConfig.js";
+import { getRoutes } from "./getRoutes.js";
+import { getComponent } from "./getComponent.js";
+import { tungstenCorePrivateEnvSchema } from "./Servers/tungstenCorePrivateEnvSchema.js";
+export class Framework {
+  constructor() {
+    _defineProperty(this, "config", void 0);
+    _defineProperty(this, "compilationInfo", void 0);
+    _defineProperty(this, "frameworkModules", void 0);
+    _defineProperty(this, "clientImportAliases", void 0);
+    _defineProperty(this, "devServer", void 0);
+    _defineProperty(this, "prodServer", void 0);
+  }
+  async init() {
+    // const configOrUndefined = await this.getUserConfig()
+    // if (configOrUndefined === undefined) {
+    //     throwError('Framework.init()', 'config is undefined')
+    // }
+    // return configOrUndefined
+    return this.getUserConfig();
+  }
+  async build(mode) {
+    if (mode === 'dev') {
+      const proms = [this.compileUserApp('dev'), this.copyFrameworkAssets('dev')];
+      await Promise.all(proms);
+      //await devBundle()
+      cliNews(`Build complete`);
+    } else {
+      const proms = [this.compileUserApp('prod'), this.copyFrameworkAssets('prod')];
+      await Promise.all(proms);
+      await this.bundle();
+      //cliNews(`Production build complete`) // we will do the announcing in cli/commands/build.ts
+    }
+  }
+  async clean(mode) {
+    const projectDir = process.cwd();
+    switch (mode) {
+      case 'prod':
+        {
+          await Promise.all([rmfr(join(projectDir, prodBuildFolder)), rmfr(join(projectDir, bundleFolder))]);
+          break;
+        }
+      case 'staticSite':
+        {
+          await rmfr(join(projectDir, staticSiteFolder));
+          break;
+        }
+      case 'dev':
+        {
+          await rmfr(join(projectDir, devBuildOuterFolder));
+          break;
+        }
+      default:
+        {
+          await rmfr(join(projectDir, buildFolder));
+          break;
+        }
+    }
+  }
+  async staticGen() {
+    await staticGen(this);
+  }
+  async getUserConfig() {
+    return this.config = await getUserConfig();
+    // const userConfigOrNull = await findUserConfig(process.cwd())
+    // if (userConfigOrNull !== null) {
+    //     const userConfig = userConfigOrNull
+    //     this.config = makeFinalConfig(userConfig.data)
+    // } else {
+    //     this.config = defaultConfig
+    // }
+    // return this.config
+  }
+  async compileUserApp(mode) {
+    if (this.config === undefined) {
+      throw new TungstenError(`SxyFramework.compileUserApp() error: config is undefined`);
+    }
+    const projectDir = process.cwd();
+    const compilationInfo = await compileUserApp(projectDir, this.config, mode);
+    this.compilationInfo = compilationInfo;
+    return compilationInfo;
+  }
+  async copyFrameworkAssets(mode) {
+    if (this.config === undefined) {
+      throw new TungstenError(`SxyFramework.copyFrameworkAssets() error: config is undefined`);
+    }
+    cliOut(`Getting framework modules`);
+    this.frameworkModules = getAllTungstenClientModules();
+    cliOut(`Getting framework client aliases`);
+    this.clientImportAliases = getTungstenClientPackageAliases();
+    cliOut(`Creating app files`);
+    await Promise.all([createInstanceConfigFile(this.config, mode), createClientFiles(this.config, mode)]);
+  }
+  async bundle() {
+    const projectDir = process.cwd();
+    if (this.config === undefined) throw new TungstenError(`SxyFramework.bundle() error, this.config is undefined`);
+    await bundle(projectDir);
+  }
+  async createDevServer() {
+    cliOut(`Creating dev server`);
+    // TS define requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
+    global.tungstenPublicEnv = {};
+    // should we default the debug value? we'd have issues if they set DEBUG to undef
+    global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
+    //cliOut(`Try Load Env`)
+    //this.loadEnv()
+    if (this.config === undefined) throwError('Framework.createDevServer()', 'config is undefined');
+    if (this.compilationInfo === undefined) {
+      throwError('Framework.createDevServer()', 'compilationInfo is undefined');
+    }
+    const initialProcessEnv = {
+      ...process.env
+    };
+    //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+    // !REVIEW! why do we need to load envs here?
+    //await loadEnvsDev(this.config, load, initialProcessEnv, false)
+    await loadEnvsDev(this.config, -1, initialProcessEnv, false);
+    this.devServer = new DevServer(this, this.config, this.compilationInfo);
+    return this.devServer;
+  }
+  async createEnvProd(config) {
+    /* NEW ENV
+    1) load env schemas from user app
+    2) If there are env schemas, load the relevant env and parse with schemas
+    3) Write public env to web files to be loaded by web client
+    */
+    /* Update plan:
+    Check for both schemas from the schemas file, and validators on the global object
+    If neither present, throw an error
+    For schemas, load env, parse, write
+    For validators, load env, pass to validators, receive result and write
+    */
+    // TS global var definition requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
+    global.tungstenPublicEnv = {};
+    // should we default the debug value? we'd have issues if they set DEBUG to undef
+    global.tungstenPrivateEnv = {/*TUNGSTEN_SERVER_PORT: -999*/};
+    // Load schemas
+    const envSchemas = await getEnvSchemas(config);
+    let someEnvLoaded = false; // eslint-disable-line no-type-assertion/no-type-assertion -- widening
+    //const envsLoadedMessages: string[] = []
+    function loadEnv(fileName, filePath, prefix = '') {
+      const env = parseIni(readFileSync(filePath, 'utf-8'));
+      someEnvLoaded = true;
+      cliOut(`${fileName} loaded from ${filePath}`);
+      injectEnv(env, process.env, prefix);
+      //console.log('process.env after injecting ' + fileName, process.env)
+    }
+    const projectDir = process.cwd();
+    const envLocation = join(projectDir, '.env');
+    const privateEnvLocation = join(projectDir, '.env.private');
+    const publicEnvLocation = join(projectDir, '.env.public');
+    //console.log(envLocation)
+    //console.log(privateEnvLocation)
+    //console.log(publicEnvLocation)
+    const envExists = existsSync(envLocation);
+    const publicEnvExists = existsSync(publicEnvLocation);
+    const privateEnvExists = existsSync(privateEnvLocation);
+    //console.log(envExists)
+    // load .env
+    if (envExists) {
+      await loadEnv('.env', envLocation);
+    }
+    // load .env.private
+    if (privateEnvExists) {
+      await loadEnv('.env.private', privateEnvLocation);
+    }
+    // load .env.public   
+    if (publicEnvExists) {
+      await loadEnv('.env.public', publicEnvLocation, 'TUNGSTEN_PUBLIC_');
+    }
+    if (!someEnvLoaded) cliOut('No env files were loaded');
+    // If there are env schemas, load the relevant env and parse with schemas
+    if ('privateEnvSchema' in envSchemas) {
+      // parse process.env
+      // save to our private env store
+      const privateEnv = envSchemas.privateEnvSchema.parse(process.env);
+      // tungstenCorePrivateEnvSchema has been configured not to mutate the result
+      // although this could change in if it is changed in the future
+      // we could toss the result of this parse and just use privateEnv
+      // but this may lead to violation of the contract if tungstenCorePrivateEnvSchema
+      // is set to alter data
+      const corePrivateEnv = tungstenCorePrivateEnvSchema.parse(privateEnv);
+      global.tungstenPrivateEnv = corePrivateEnv;
+      cliOut('tungsten private env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
+    }
+    if ('publicEnvSchema' in envSchemas) {
+      // const filteredEnv = objectMap(
+      //     objectFilter(
+      //         process.env,
+      //         (key) => key.startsWith('TUNGSTEN_PUBLIC_')
+      //     ),
+      //     (key, value) => [key.slice('TUNGSTEN_PUBLIC_'.length), value]
+      // )
+      //console.log('env filtered for public env', filteredEnv)
+      global.tungstenPublicEnv = envSchemas.publicEnvSchema.parse(objectRemap(objectFilter(process.env, key => key.startsWith('TUNGSTEN_PUBLIC_')), (key, value) => [key.slice('TUNGSTEN_PUBLIC_'.length), value]));
+      // save to public env file
+      const clientContents = readFileSync(join(projectDir, bundleFolder, 'client.js'), 'utf-8');
+      const publicEnvContent = windowGlobalEnvStatement('tungstenPublicEnv', global.tungstenPublicEnv);
+      const clientWithEnvHandle = openSync(join(projectDir, bundleFolder, 'clientWithEnv.js'), 'w');
+      writeFileSync(clientWithEnvHandle, publicEnvContent);
+      writeFileSync(clientWithEnvHandle, clientContents);
+      closeSync(clientWithEnvHandle);
+      cliOut('tungsten public env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
+    } else {
+      //cliOut('copy client to clientWithEnv.js')
+      copyFileSync(join(projectDir, bundleFolder, 'client.js'), join(projectDir, bundleFolder, 'clientWithEnv.js'));
+    }
+  }
+  async createProdServer() {
+    if (this.config === undefined) {
+      throw new TungstenError(`SxyFramework.createProdServer() error: config is undefined`);
+    }
+    await this.createEnvProd(this.config);
+    const projectDir = process.cwd();
+    const prodBuildLocation = join(projectDir, prodBuildFolder);
+    const bundleLocation = join(projectDir, bundleFolder);
+    this.frameworkModules = getAllTungstenClientModules();
+    this.clientImportAliases = getTungstenClientPackageAliases();
+    this.compilationInfo = {
+      type: 'success',
+      projectDir: projectDir,
+      codeLocation: join(projectDir, this.config.codeDir),
+      buildLocation: prodBuildLocation,
+      codeSubPath: buildCodeSubPath,
+      buildCodeLocation: join(projectDir, prodBuildCodeFolder),
+      location: prodBuildLocation,
+      bundleLocation,
+      importAliases: {} // probably needs to be filled with some details
+      //packages: []
+    };
+    let serverMiddleware = null;
+    if (this.config.serverMiddleware) {
+      const [middlewareFile, middlewareExportName, middlewarePath] = this.config.serverMiddleware;
+      const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
+      const middlewareModule = await import(fullFilePath);
+      if (!(middlewareExportName in middlewareModule)) {
+        throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile}` + ` when trying to load server middleware`);
+      }
+      const middlewares = middlewareModule[middlewareExportName];
+      //console.log('prod middlewares', middlewares)
+      const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath;
+      serverMiddleware = {
+        path,
+        middlewares
+      };
+    }
+    const appRoutes = await getRoutes(this.compilationInfo, this.config);
+    const RootComponentClass = this.config.useRootComponent ? await getComponent(join(this.compilationInfo.buildCodeLocation, this.config.rootComponent), this.config.rootComponent) : null;
+    this.prodServer = new ProdServer(this, this.config, this.compilationInfo, appRoutes, RootComponentClass, serverMiddleware);
+    return this.prodServer;
+  }
+}

package/dist/FrameworkConfig.d.ts

@@ -0,0 +1,76 @@
+import { ParserOptions as BabelParserOptions } from '@babel/parser';
+import type { BindMode } from './components/bindable/BindMode.js';
+import { SiteBasePath } from './render/HeadData.js';
+type AppLocation = string | [string, string];
+type RoutesLocation = [string, string];
+type EnvSchemasLocation = string;
+export type ServerMiddlewareInfo = [file: string, exportName: string, path: string];
+export type FrameworkConfigBase = {
+    codeDir?: string;
+    copy?: string;
+    exclude?: string;
+    copyExclude?: string;
+    sourceDir?: string;
+    publicDir?: string;
+    assetsDir?: string;
+    styleImportBase?: string;
+    siteBasePath?: SiteBasePath;
+    clientSideNav?: boolean;
+    staticSite?: boolean;
+    routesLocation?: RoutesLocation;
+    envSchemasLocation?: EnvSchemasLocation;
+    babelOptions?: BabelParserOptions;
+    packageSystem?: 'rewrites' | 'aliases';
+    ignoreDirs?: string[];
+    ignorePatterns?: string | string[];
+    serverMiddleware?: ServerMiddlewareInfo;
+    apiRoutes?: string;
+    apiPath?: string;
+    suppressNoHeadWarning?: boolean;
+    suppressOriginMismatchWarning?: boolean;
+};
+export type FrameworkConfigWithRootComponent = FrameworkConfigBase & {
+    useRootComponent?: true;
+    rootComponent: string;
+};
+export type FrameworkConfigWithoutRootComponent = FrameworkConfigBase & {
+    useRootComponent: false;
+};
+export type FrameworkConfig = FrameworkConfigWithRootComponent | FrameworkConfigWithoutRootComponent;
+export type FrameworkConfigCompleteBase = {
+    codeDir: string;
+    exclude?: string;
+    copy?: string;
+    copyExclude?: string;
+    sourceDir?: string;
+    publicDir?: string;
+    assetsDir?: string;
+    styleImportBase?: string;
+    siteBasePath: SiteBasePath;
+    clientSideNav: boolean;
+    staticSite: boolean;
+    uniqueComponents: boolean;
+    bindMode: BindMode;
+    appLocation: AppLocation;
+    routesLocation: RoutesLocation;
+    envSchemasLocation: EnvSchemasLocation;
+    babelOptions?: BabelParserOptions;
+    packageSystem: 'rewrites' | 'aliases';
+    ignoreDirs?: string[];
+    ignorePatterns?: string | string[];
+    serverMiddleware?: ServerMiddlewareInfo;
+    apiRoutes?: string;
+    apiPath: string;
+    suppressNoHeadWarning: boolean;
+    suppressOriginMismatchWarning: boolean;
+};
+export type FrameworkConfigCompleteWithRootComponent = FrameworkConfigCompleteBase & {
+    useRootComponent: true;
+    rootComponent: string;
+};
+export type FrameworkConfigCompleteWithoutRootComponent = FrameworkConfigCompleteBase & {
+    useRootComponent: false;
+};
+export type FrameworkConfigComplete = FrameworkConfigCompleteWithRootComponent | FrameworkConfigCompleteWithoutRootComponent;
+export {};
+//# sourceMappingURL=FrameworkConfig.d.ts.map

package/dist/FrameworkConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FrameworkConfig.d.ts","sourceRoot":"","sources":["../src/FrameworkConfig.ts"],"names":[],"mappings":"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"}

package/dist/FrameworkConfig.js

@@ -0,0 +1 @@
+export {};

package/dist/FunctionComponent.d.ts

@@ -0,0 +1,12 @@
+import type { TungstenComponentPropsBase } from './Components.jsx';
+import type { ContentNode } from './ContentNode.js';
+import type { ComponentRenderInfo } from './ComponentRenderInfo.type.js';
+import { TungstenStyleObject } from './TungstenStyleObject.js';
+export type FunctionComponent<Props extends TungstenComponentPropsBase, RouteData = unknown> = {
+    (props: Props): ContentNode;
+    style?: TungstenStyleObject;
+    tagName?: string;
+    displayName?: string;
+    render?: ComponentRenderInfo;
+};
+//# sourceMappingURL=FunctionComponent.d.ts.map

package/dist/FunctionComponent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FunctionComponent.d.ts","sourceRoot":"","sources":["../src/FunctionComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,MAAM,iBAAiB,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS,GAAG,OAAO,IAAI;IAC3F,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAA;IAC3B,KAAK,CAAC,EAAE,mBAAmB,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAC/B,CAAA"}

package/dist/FunctionComponent.js

@@ -0,0 +1,40 @@
+export {};
+// import { JsxElementLike } from './JsxElementLike.js'
+// import { TungstenComponent } from './TungstenComponent.js'
+// import { styleContent } from './style/styleContent.js'
+// // creating an instance for the function component
+// class FunctionComponent {
+//     content: () => JsxElementLike
+//     style?: object
+//     constructor(func) {
+//         this.content = func
+//         if ('style' in func) {
+//             this.style = func.style
+//         }
+//     }
+//     __content() {
+//         return this.content()
+//     }
+//     __styledContent() {
+//         const content = this.__content()
+//         if ('style' in this) {
+//             return styleContent(content, this.style)
+//         }
+//         return content
+//     }
+// }
+// function instantiate(type) {
+//     if (type.prototype instanceof TungstenComponent) {
+//         return new type
+//     } else {
+//         return new FunctionComponent(type)
+//     }
+// }
+// // orrrr just call the function and make no state
+// function getStyledContentFromFunctionComponent(func) {
+//     const content = func()
+//     if ('style' in func) {
+//         return styleContent(content, func.style)
+//     }
+//     return content
+// }

package/dist/FunctionComponentStandIn.d.ts

@@ -0,0 +1,53 @@
+import type { FunctionComponent } from './FunctionComponent.js';
+import type { DomRegion } from './DomRegion.js';
+import type { Instance } from './Instance/Instance.js';
+import type { TungstenElement } from './TungstenElement.js';
+import type { TungstenComponentPropsBase } from './Components.jsx';
+import type { RouteParams } from './routing/RouteParams.type.js';
+import { ContentNode } from './ContentNode.js';
+import { type $ContentNull } from './symbols.js';
+import { RenderedContentNode } from './RenderedContentNode.js';
+import { UpdateResult } from './update/UpdateResult.js';
+type Memo = {
+    dependencies: any[];
+    value: any;
+};
+type Callback = {
+    dependencies: any[];
+    func: (...args: any[]) => any;
+};
+export declare class FunctionElement<Props extends TungstenComponentPropsBase, RouteData> {
+    func: FunctionComponent<Props>;
+    props: Props;
+    routeParams?: RouteParams | undefined;
+    routeData?: RouteData | undefined;
+    __instance: Instance;
+    parentComponent: TungstenElement | null;
+    childComponents: TungstenElement[];
+    __currentContent: RenderedContentNode | $ContentNull;
+    __domRegion?: DomRegion;
+    __queuedUpdateHandle?: NodeJS.Timeout;
+    useStateIndex: number;
+    state: any[];
+    useEffectIndex: number;
+    effects: any[][];
+    useMemoIndex: number;
+    memos: Memo[][];
+    useCallbackIndex: number;
+    callbacks: Callback[][];
+    constructor(func: FunctionComponent<Props>, props: Props, routeParams: RouteParams | undefined, routeData: RouteData | undefined, instance: Instance, parentComponent: TungstenElement | null);
+    __queueUpdate: () => void;
+    update: () => Promise<UpdateResult>;
+    __update: () => Promise<UpdateResult>;
+    __updateAndReturnContent: () => Promise<{
+        content: ContentNode;
+        complete: () => void;
+    }>;
+    styledContent: () => Promise<ContentNode>;
+    content: () => Promise<ContentNode>;
+    __delete: () => void;
+    __deleted: () => void;
+}
+export type FunctionComponentStandInAny = FunctionElement<any, any>;
+export {};
+//# sourceMappingURL=FunctionComponentStandIn.d.ts.map

package/dist/FunctionComponentStandIn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FunctionComponentStandIn.d.ts","sourceRoot":"","sources":["../src/FunctionComponentStandIn.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAKvD,KAAK,IAAI,GAAG;IACR,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,KAAK,EAAE,GAAG,CAAA;CACb,CAAA;AACD,KAAK,QAAQ,GAAG;IACZ,YAAY,EAAE,GAAG,EAAE,CAAC;IACpB,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;CAChC,CAAA;AAED,qBAAa,eAAe,CAAC,KAAK,SAAS,0BAA0B,EAAE,SAAS;IAC5E,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC9B,KAAK,EAAE,KAAK,CAAA;IACZ,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,QAAQ,CAAA;IACpB,eAAe,EAAE,eAAe,GAAG,IAAI,CAAA;IACvC,eAAe,EAAE,eAAe,EAAE,CAAK;IACvC,gBAAgB,EAAE,mBAAmB,GAAG,YAAY,CAAe;IACnE,WAAW,CAAC,EAAE,SAAS,CAAA;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAErC,aAAa,SAAI;IACjB,KAAK,EAAE,GAAG,EAAE,CAAK;IACjB,cAAc,SAAI;IAClB,OAAO,EAAE,GAAG,EAAE,EAAE,CAAK;IACrB,YAAY,SAAI;IAChB,KAAK,EAAE,IAAI,EAAE,EAAE,CAAK;IACpB,gBAAgB,SAAI;IACpB,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAK;gBAEhB,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EACpD,WAAW,EAAE,WAAW,GAAG,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EACtE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,GAAG,IAAI;IAS/D,aAAa,aAIZ;IACD,MAAM,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAclC;IACD,QAAQ,8BAAsB;IAC9B,wBAAwB;;;OAWvB;IACD,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAMxC;IACD,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAwBlC;IACD,QAAQ,aAEP;IACD,SAAS,aAER;CACJ;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA"}

package/dist/FunctionComponentStandIn.js

@@ -0,0 +1,107 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { styleContent } from "./style/styleContent.js";
+import { errorOut } from "./output.js";
+import { isDev } from "./isDev.js";
+import { TungstenError } from "./TungstenError.js";
+import { $contentNull } from "./symbols.js";
+import { integrateElementUpdateVdom } from "./update/integrateUpdateVdom.js";
+import { setCurrentComponent } from "./hooks/setCurrentComponent.js";
+import { clearCurrentComponent } from "./hooks/clearCurrentComponent.js";
+export class FunctionElement {
+  constructor(func, props, routeParams, routeData, instance, parentComponent) {
+    _defineProperty(this, "func", void 0);
+    _defineProperty(this, "props", void 0);
+    _defineProperty(this, "routeParams", void 0);
+    _defineProperty(this, "routeData", void 0);
+    _defineProperty(this, "__instance", void 0);
+    _defineProperty(this, "parentComponent", void 0);
+    _defineProperty(this, "childComponents", []);
+    _defineProperty(this, "__currentContent", $contentNull);
+    _defineProperty(this, "__domRegion", void 0);
+    _defineProperty(this, "__queuedUpdateHandle", void 0);
+    _defineProperty(this, "useStateIndex", 0);
+    _defineProperty(this, "state", []);
+    _defineProperty(this, "useEffectIndex", 0);
+    _defineProperty(this, "effects", []);
+    _defineProperty(this, "useMemoIndex", 0);
+    _defineProperty(this, "memos", []);
+    _defineProperty(this, "useCallbackIndex", 0);
+    _defineProperty(this, "callbacks", []);
+    _defineProperty(this, "__queueUpdate", () => {
+      if (this.__queuedUpdateHandle === undefined) {
+        this.__queuedUpdateHandle = setTimeout(() => this.update(), 0);
+      }
+    });
+    _defineProperty(this, "update", async () => {
+      if (this.__queuedUpdateHandle !== undefined) {
+        clearTimeout(this.__queuedUpdateHandle);
+        delete this.__queuedUpdateHandle;
+      }
+      // do update
+      setCurrentComponent(this);
+      //const styledContent = await getContentFromFunctionComponent(this.func, this.props)
+      const styledContent = await this.styledContent();
+      //console.log('got new content for func comp', styledContent)
+      clearCurrentComponent();
+      //integrateUpdate(this, styledContent)
+      const updateResult = integrateElementUpdateVdom(this, styledContent);
+      return updateResult;
+    });
+    _defineProperty(this, "__update", () => this.update());
+    _defineProperty(this, "__updateAndReturnContent", async () => {
+      if (this.__queuedUpdateHandle !== undefined) {
+        clearTimeout(this.__queuedUpdateHandle);
+        delete this.__queuedUpdateHandle;
+      }
+      setCurrentComponent(this);
+      const styledContent = await this.styledContent();
+      return {
+        content: styledContent,
+        complete: () => {}
+      };
+    });
+    _defineProperty(this, "styledContent", async () => {
+      const content = await this.content();
+      if (this.func.style !== undefined) {
+        return styleContent(content, this.func.style);
+      }
+      return content;
+    });
+    _defineProperty(this, "content", async () => {
+      try {
+        return await this.func(this.props);
+      } catch (e) {
+        if (isDev) {
+          if (typeof e === 'object' && e !== null && 'name' in e && e.name === 'TypeError') {
+            const details = 'stack' in e ? String(e.stack) : String(e);
+            errorOut(details);
+            throw new TungstenError(`Error generating output from component. Did you forget to extend TungstenComponent` + ` in a class based component?\nError: ${details}\nComponent: ${this.func}`);
+          } else {
+            throw e;
+          }
+        } else {
+          return null;
+        }
+      } finally {
+        this.useStateIndex = 0;
+        this.useEffectIndex = 0;
+        this.useMemoIndex = 0;
+        this.useCallbackIndex = 0;
+      }
+    });
+    _defineProperty(this, "__delete", () => {
+      // do nothing?
+    });
+    _defineProperty(this, "__deleted", () => {
+      // do nothing?
+    });
+    this.func = func;
+    this.props = props;
+    this.routeParams = routeParams;
+    this.routeData = routeData;
+    this.__instance = instance;
+    this.parentComponent = parentComponent;
+  }
+}

package/dist/GenericObject.type.d.ts

@@ -0,0 +1,2 @@
+export type GenericObject = Record<string | symbol, unknown>;
+//# sourceMappingURL=GenericObject.type.d.ts.map

package/dist/GenericObject.type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GenericObject.type.d.ts","sourceRoot":"","sources":["../src/GenericObject.type.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,GAAC,MAAM,EAAE,OAAO,CAAC,CAAA"}

package/dist/GenericObject.type.js

@@ -0,0 +1 @@
+export {};

package/dist/HtmlElementAttributes.d.ts

@@ -0,0 +1,2 @@
+export type HtmlElementAttributes = Record<string, unknown>;
+//# sourceMappingURL=HtmlElementAttributes.d.ts.map

package/dist/HtmlElementAttributes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HtmlElementAttributes.d.ts","sourceRoot":"","sources":["../src/HtmlElementAttributes.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA"}

package/dist/HtmlElementAttributes.js

@@ -0,0 +1 @@
+export {};

package/dist/Instance/Instance.d.ts

@@ -0,0 +1,40 @@
+import type { InstanceConfig } from '../Instance/InstanceConfig.js';
+import type { ReqRes } from '../ReqRes.js';
+import type { AppRoutes } from '../routing/AppRoutes.js';
+import type { GlobalData } from '../routing/registerGlobalData.js';
+import { InternalStoreSchema } from '../Store/InternalStoreSchema.js';
+import { type TrueStore } from '../Store/makeStore.js';
+import { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
+import { type RouteKey } from '../routing/RouteTypes.js';
+import type { Routes } from '../routing/Routes.js';
+import { StoreSubscriptionsMap } from 'tungsten/Store/StoreSubscriptions.types.js';
+import { RedirectCode } from '../routing/RedirectCode.js';
+export declare class Instance {
+    location: string;
+    reqRes: ReqRes | null;
+    appRoutes: AppRoutes;
+    routes: Routes;
+    hydrationComplete: boolean;
+    internalStore: TrueStore<InternalStoreSchema>;
+    stores: TrueStore<any>[];
+    storeSubscriptions: StoreSubscriptionsMap;
+    serverLoadingData: boolean;
+    routeDataError?: unknown;
+    routeData?: any;
+    config: InstanceConfig;
+    title?: string;
+    defaultTitle: string;
+    globalData: GlobalData;
+    matchedRouteInfo: MatchedRouteInfo;
+    persistentHeadChildren: HTMLElement[];
+    navigating: boolean;
+    constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes, routes: Routes, internalStore: TrueStore<InternalStoreSchema>, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: GlobalData, matchedRouteInfo: MatchedRouteInfo);
+    getRoutes: () => Routes;
+    updateLocation: (location: string) => void;
+    goto: (routeKey: RouteKey) => Promise<void>;
+    redirect: (url: string, code?: RedirectCode) => void;
+    setDefaultTitle: (defaultTitle: string) => void;
+    setTitle: (title: string) => void;
+    setTitleToDefault: () => void;
+}
+//# sourceMappingURL=Instance.d.ts.map

package/dist/Instance/Instance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACrE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAA;AAKlF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAKzD,qBAAa,QAAQ;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,UAAQ;IACzB,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAA;IACxB,kBAAkB,EAAE,qBAAqB,CAAA;IACzC,iBAAiB,EAAE,OAAO,CAAQ;IAClC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,EAAE,GAAG,CAAA;IAGf,MAAM,EAAE,cAAc,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,sBAAsB,EAAE,WAAW,EAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAQ;gBAEvB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EAGd,aAAa,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAC7C,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EACxB,kBAAkB,EAAE,qBAAqB,EACzC,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAgCtC,SAAS,eAER;IACD,cAAc,GAAI,UAAU,MAAM,UAMjC;IACD,IAAI,GAAU,UAAU,QAAQ,mBA6D/B;IASD,QAAQ,GAAI,KAAK,MAAM,EAAE,OAAM,YAAkB,UAQhD;IACD,eAAe,GAAI,cAAc,MAAM,UAEtC;IACD,QAAQ,GAAI,OAAO,MAAM,UAIxB;IACD,iBAAiB,aAEhB;CAIJ"}