toiljs 0.0.14 → 0.0.16

package/tsconfig.json

@@ -1,22 +1,22 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "module": "ESNext",
-        "target": "ESNext",
-        "moduleResolution": "bundler",
-        "jsx": "react-jsx",
-        "noEmit": true,
-        "incremental": false
-    },
-    "include": [
-        "src/**/*.ts",
-        "src/**/*.tsx",
-        "test/**/*.ts",
-        "std/client/index.d.ts"
-    ],
-    "exclude": [
-        "node_modules",
-        "build",
-        "src/server"
-    ]
-}
+{
+    "extends": "./tsconfig.base.json",
+    "compilerOptions": {
+        "module": "ESNext",
+        "target": "ESNext",
+        "moduleResolution": "bundler",
+        "jsx": "react-jsx",
+        "noEmit": true,
+        "incremental": false
+    },
+    "include": [
+        "src/**/*.ts",
+        "src/**/*.tsx",
+        "test/**/*.ts",
+        "std/client/index.d.ts"
+    ],
+    "exclude": [
+        "node_modules",
+        "build",
+        "src/server"
+    ]
+}

package/tsconfig.logger.json

@@ -1,12 +1,12 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "module": "ESNext",
-        "target": "ESNext",
-        "moduleResolution": "bundler",
-        "rootDir": "src/logger",
-        "outDir": "build/logger",
-        "tsBuildInfoFile": "build/logger/.tsbuildinfo"
-    },
-    "include": ["src/logger/**/*"]
-}
+{
+    "extends": "./tsconfig.base.json",
+    "compilerOptions": {
+        "module": "ESNext",
+        "target": "ESNext",
+        "moduleResolution": "bundler",
+        "rootDir": "src/logger",
+        "outDir": "build/logger",
+        "tsBuildInfoFile": "build/logger/.tsbuildinfo"
+    },
+    "include": ["src/logger/**/*"]
+}

package/tsconfig.server.json

@@ -1,10 +1,10 @@
-{
-    "extends": "toilscript/std/assembly.json",
-    "compilerOptions": {
-        "experimentalDecorators": true,
-        "noEmit": true
-    },
-    "include": [
-        "src/server/**/*.ts"
-    ]
-}
+{
+    "extends": "toilscript/std/assembly.json",
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "noEmit": true
+    },
+    "include": [
+        "src/server/**/*.ts"
+    ]
+}

package/tsconfig.shared.json

@@ -1,12 +1,12 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "module": "ESNext",
-        "target": "ESNext",
-        "moduleResolution": "bundler",
-        "rootDir": "src/shared",
-        "outDir": "build/shared",
-        "tsBuildInfoFile": "build/shared/.tsbuildinfo"
-    },
-    "include": ["src/shared/**/*"]
-}
+{
+    "extends": "./tsconfig.base.json",
+    "compilerOptions": {
+        "module": "ESNext",
+        "target": "ESNext",
+        "moduleResolution": "bundler",
+        "rootDir": "src/shared",
+        "outDir": "build/shared",
+        "tsBuildInfoFile": "build/shared/.tsbuildinfo"
+    },
+    "include": ["src/shared/**/*"]
+}

package/vitest.config.ts

@@ -1,26 +1,26 @@
-import react from '@vitejs/plugin-react';
-import { configDefaults, defineConfig } from 'vitest/config';
-
-export default defineConfig({
-    plugins: [react()],
-    test: {
-        globals: true,
-        environment: 'node',
-        include: ['test/**/*.test.ts', 'test/**/*.test.tsx', 'test/**/*.spec.ts'],
-        // test/assembly holds toilscript specs run by as-pect, not vitest.
-        exclude: [...configDefaults.exclude, 'test/assembly/**'],
-        coverage: {
-            provider: 'v8',
-            reporter: ['text', 'json', 'html'],
-            exclude: [
-                'node_modules/',
-                'build/',
-                'browser/',
-                'test/',
-                '**/*.d.ts',
-                '**/*.config.*',
-                '**/mockData',
-            ],
-        },
-    },
-});
+import react from '@vitejs/plugin-react';
+import { configDefaults, defineConfig } from 'vitest/config';
+
+export default defineConfig({
+    plugins: [react()],
+    test: {
+        globals: true,
+        environment: 'node',
+        include: ['test/**/*.test.ts', 'test/**/*.test.tsx', 'test/**/*.spec.ts'],
+        // test/assembly holds toilscript specs run by as-pect, not vitest.
+        exclude: [...configDefaults.exclude, 'test/assembly/**'],
+        coverage: {
+            provider: 'v8',
+            reporter: ['text', 'json', 'html'],
+            exclude: [
+                'node_modules/',
+                'build/',
+                'browser/',
+                'test/',
+                '**/*.d.ts',
+                '**/*.config.*',
+                '**/mockData',
+            ],
+        },
+    },
+});

package/.idea/codeStyles/Project.xml

@@ -1,54 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="USE_EXPLICIT_JS_EXTENSION" value="ALWAYS_JS" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JSON">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="100" />
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="100" />
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/toiljs.iml" filepath="$PROJECT_DIR$/.idea/toiljs.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-    <option name="myRunOnSave" value="true" />
-  </component>
-</project>

package/.idea/toiljs.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/.toil/entry.tsx

@@ -1,9 +0,0 @@
-// AUTO-GENERATED by toil — do not edit.
-import { mount } from 'toiljs/client';
-import { BinaryWriter, BinaryReader, FastMap, FastSet } from 'toiljs/io';
-import { routes, layout, notFound } from './routes';
-
-// Expose toiljs IO as native globals (typed via ./toil-env.d.ts).
-Object.assign(globalThis, { BinaryWriter, BinaryReader, FastMap, FastSet });
-
-mount(routes, layout, notFound);

package/.toil/index.html

@@ -1,12 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Toil App</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="./entry.tsx"></script>
-  </body>
-</html>

package/.toil/routes.ts

@@ -1,9 +0,0 @@
-// AUTO-GENERATED by toil — do not edit.
-import type { RouteDef, LayoutLoader, NotFoundLoader } from 'toiljs/client';
-
-export const routes: RouteDef[] = [
-
-];
-
-export const layout: LayoutLoader = null;
-export const notFound: NotFoundLoader = null;

package/build/cli/configure.d.ts

@@ -1,16 +0,0 @@
-import { type Preprocessor, type StyleFeatures } from './features.js';
-export interface ConfigureOptions {
-    readonly root?: string;
-    readonly cwd: string;
-    readonly preprocessor?: Preprocessor;
-    readonly tailwind?: boolean;
-    readonly images?: boolean;
-    readonly install?: boolean;
-}
-interface PackageJson {
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-}
-export declare function applyConfigure(clientDir: string, pkgPath: string, pkg: PackageJson, from: StyleFeatures, to: StyleFeatures): Promise<void>;
-export declare function runConfigure(opts: ConfigureOptions): Promise<void>;
-export {};

package/build/cli/configure.js

@@ -1,272 +0,0 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { cancel, confirm, intro, isCancel, note, outro, select, spinner } from '@clack/prompts';
-import { loadConfig } from 'toiljs/compiler';
-import pc from 'picocolors';
-import { defaultConfigSource, detectPreprocessor, detectTailwind, packageDiff, PKG_VERSION, preprocessorForExt, PREPROCESSORS, setConfigImages, setStyleImports, styleEntry, TAILWIND_CSS, TAILWIND_ENTRY, } from './features.js';
-import { run } from './proc.js';
-import { accent, dim } from './ui.js';
-const CONFIG_FILES = [
-    'toil.config.ts',
-    'toil.config.mts',
-    'toil.config.js',
-    'toil.config.mjs',
-    'toiljs.config.ts',
-    'toiljs.config.mts',
-    'toiljs.config.js',
-    'toiljs.config.mjs',
-];
-async function readConfigFile(root) {
-    for (const name of CONFIG_FILES) {
-        const p = path.join(root, name);
-        try {
-            return { path: p, source: await fs.readFile(p, 'utf8') };
-        }
-        catch { }
-    }
-    return null;
-}
-async function writeImagesFlag(root, enabled) {
-    const existing = await readConfigFile(root);
-    if (!existing) {
-        await fs.writeFile(path.join(root, 'toil.config.ts'), defaultConfigSource(enabled), 'utf8');
-        return true;
-    }
-    const next = setConfigImages(existing.source, enabled);
-    if (next === null)
-        return false;
-    await fs.writeFile(existing.path, next, 'utf8');
-    return true;
-}
-async function resolveImages(root) {
-    try {
-        return (await loadConfig({ root })).images;
-    }
-    catch {
-        return true;
-    }
-}
-async function resolveClientDir(root) {
-    try {
-        const cfg = await loadConfig({ root });
-        return cfg.clientAbsDir;
-    }
-    catch {
-        return path.join(root, 'client');
-    }
-}
-const PREPROCESSOR_LABEL = {
-    css: 'Plain CSS',
-    sass: 'Sass (SCSS)',
-    less: 'Less',
-    stylus: 'Stylus',
-};
-function bail(value) {
-    if (isCancel(value)) {
-        cancel('Configuration cancelled.');
-        process.exit(0);
-    }
-}
-async function detectStylesheet(clientDir) {
-    for (const p of PREPROCESSORS) {
-        try {
-            await fs.access(path.join(clientDir, styleEntry(p)));
-            return p;
-        }
-        catch { }
-    }
-    try {
-        await fs.access(path.join(clientDir, 'styles/main.sass'));
-        return preprocessorForExt('sass');
-    }
-    catch {
-        return null;
-    }
-}
-async function findMainStylesheet(clientDir) {
-    for (const ext of ['css', 'scss', 'sass', 'less', 'styl']) {
-        const p = path.join(clientDir, 'styles', `main.${ext}`);
-        try {
-            await fs.access(p);
-            return p;
-        }
-        catch { }
-    }
-    return null;
-}
-async function detectPackageManager(root) {
-    const lock = [
-        ['pnpm-lock.yaml', 'pnpm'],
-        ['yarn.lock', 'yarn'],
-        ['bun.lockb', 'bun'],
-    ];
-    for (const [file, pm] of lock) {
-        try {
-            await fs.access(path.join(root, file));
-            return pm;
-        }
-        catch { }
-    }
-    return 'npm';
-}
-async function applyStyleFiles(clientDir, from, to) {
-    if (from.preprocessor !== to.preprocessor) {
-        const newPath = path.join(clientDir, styleEntry(to.preprocessor));
-        await fs.mkdir(path.dirname(newPath), { recursive: true });
-        const existing = await findMainStylesheet(clientDir);
-        if (existing && path.resolve(existing) !== path.resolve(newPath)) {
-            await fs.rename(existing, newPath);
-        }
-        else if (!existing) {
-            await fs.writeFile(newPath, '', 'utf8');
-        }
-    }
-    const tailwindPath = path.join(clientDir, TAILWIND_ENTRY);
-    if (to.tailwind && !from.tailwind) {
-        await fs.mkdir(path.dirname(tailwindPath), { recursive: true });
-        await fs.writeFile(tailwindPath, TAILWIND_CSS, 'utf8');
-    }
-    else if (!to.tailwind && from.tailwind) {
-        await fs.rm(tailwindPath, { force: true });
-    }
-    for (const entry of ['toil.tsx', 'toil.jsx']) {
-        const entryPath = path.join(clientDir, entry);
-        try {
-            const source = await fs.readFile(entryPath, 'utf8');
-            await fs.writeFile(entryPath, setStyleImports(source, to), 'utf8');
-            return;
-        }
-        catch { }
-    }
-}
-export async function applyConfigure(clientDir, pkgPath, pkg, from, to) {
-    await applyStyleFiles(clientDir, from, to);
-    await applyPackages(pkgPath, pkg, from, to);
-}
-async function applyPackages(pkgPath, pkg, from, to) {
-    const { add, remove } = packageDiff(from, to);
-    const dev = { ...pkg.devDependencies };
-    const deps = { ...pkg.dependencies };
-    for (const name of add)
-        dev[name] = PKG_VERSION[name] ?? 'latest';
-    for (const name of remove) {
-        delete dev[name];
-        delete deps[name];
-    }
-    const sortedDev = Object.fromEntries(Object.entries(dev).sort(([a], [b]) => a.localeCompare(b)));
-    const next = { ...pkg, devDependencies: sortedDev };
-    if (Object.keys(deps).length)
-        next.dependencies = deps;
-    else
-        delete next.dependencies;
-    await fs.writeFile(pkgPath, JSON.stringify(next, null, 4) + '\n', 'utf8');
-}
-function describe(from, to) {
-    const lines = [];
-    if (from.preprocessor !== to.preprocessor) {
-        lines.push(`preprocessor: ${PREPROCESSOR_LABEL[from.preprocessor]} → ${PREPROCESSOR_LABEL[to.preprocessor]}`);
-    }
-    if (from.tailwind !== to.tailwind) {
-        lines.push(`Tailwind: ${from.tailwind ? 'on' : 'off'} → ${to.tailwind ? 'on' : 'off'}`);
-    }
-    const { add, remove } = packageDiff(from, to);
-    if (add.length)
-        lines.push(`+ ${add.join(', ')}`);
-    if (remove.length)
-        lines.push(`- ${remove.join(', ')}`);
-    return lines.map((l) => dim('  ') + l).join('\n');
-}
-export async function runConfigure(opts) {
-    intro(accent(' toiljs configure '));
-    const root = path.resolve(opts.root ?? opts.cwd);
-    const pkgPath = path.join(root, 'package.json');
-    let pkg;
-    try {
-        pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8'));
-    }
-    catch {
-        cancel(`No package.json in ${pc.cyan(root)}, run this inside a toiljs project.`);
-        process.exit(1);
-    }
-    const clientAbsDir = await resolveClientDir(root);
-    const deps = { ...pkg.dependencies, ...pkg.devDependencies };
-    const current = {
-        preprocessor: (await detectStylesheet(clientAbsDir)) ?? detectPreprocessor(deps),
-        tailwind: detectTailwind(deps),
-    };
-    const currentImages = await resolveImages(root);
-    const nonInteractive = opts.preprocessor !== undefined || opts.tailwind !== undefined || opts.images !== undefined;
-    let target;
-    let targetImages;
-    if (nonInteractive) {
-        target = {
-            preprocessor: opts.preprocessor ?? current.preprocessor,
-            tailwind: opts.tailwind ?? current.tailwind,
-        };
-        targetImages = opts.images ?? currentImages;
-    }
-    else {
-        const ppChoice = await select({
-            message: 'CSS preprocessor',
-            options: PREPROCESSORS.map((value) => ({ value, label: PREPROCESSOR_LABEL[value] })),
-            initialValue: current.preprocessor,
-        });
-        bail(ppChoice);
-        const twChoice = await confirm({
-            message: 'Use Tailwind CSS?',
-            initialValue: current.tailwind,
-        });
-        bail(twChoice);
-        const imChoice = await confirm({
-            message: 'Optimize images at build time?',
-            initialValue: currentImages,
-        });
-        bail(imChoice);
-        target = { preprocessor: ppChoice, tailwind: twChoice };
-        targetImages = imChoice;
-    }
-    const styleChanged = target.preprocessor !== current.preprocessor || target.tailwind !== current.tailwind;
-    const imagesChanged = targetImages !== currentImages;
-    if (!styleChanged && !imagesChanged) {
-        outro('No changes, your setup is already up to date.');
-        return;
-    }
-    const s = spinner();
-    s.start('Updating project files');
-    if (styleChanged)
-        await applyConfigure(clientAbsDir, pkgPath, pkg, current, target);
-    let imagesWarning = '';
-    if (imagesChanged && !(await writeImagesFlag(root, targetImages))) {
-        imagesWarning = pc.yellow(' Could not edit toil.config automatically, set `client.images` by hand.');
-    }
-    s.stop('Updated project files');
-    if (styleChanged) {
-        const pm = await detectPackageManager(root);
-        if (opts.install === false) {
-            note(`${pc.cyan(`${pm} install`)} to sync the dependency changes.`, 'Next step');
-        }
-        else {
-            const i = spinner();
-            i.start(`Syncing dependencies with ${pm}`);
-            try {
-                await run(pm, ['install'], root);
-                i.stop('Dependencies synced');
-            }
-            catch {
-                i.stop(pc.yellow(`Could not run \`${pm} install\`, run it yourself to finish`));
-            }
-        }
-    }
-    const summary = [
-        styleChanged ? describe(current, target) : '',
-        imagesChanged
-            ? dim('  ') +
-                `image optimization: ${currentImages ? 'on' : 'off'} → ${targetImages ? 'on' : 'off'}`
-            : '',
-        imagesWarning,
-    ]
-        .filter(Boolean)
-        .join('\n');
-    note(summary, 'Updated');
-    outro(`Reconfigured, restart \`${accent('toiljs dev')}\` to pick up the changes.`);
-}

package/build/cli/create.d.ts

@@ -1,16 +0,0 @@
-import { type Preprocessor } from './features.js';
-export type Template = 'app' | 'minimal';
-export interface CreateOptions {
-    readonly name?: string;
-    readonly template?: Template;
-    readonly preprocessor?: Preprocessor;
-    readonly tailwind?: boolean;
-    readonly ai?: boolean;
-    readonly images?: boolean;
-    readonly install?: boolean;
-    readonly git?: boolean;
-    readonly pm?: string;
-    readonly yes?: boolean;
-    readonly cwd: string;
-}
-export declare function runCreate(opts: CreateOptions): Promise<void>;