@youcan/app 1.2.0-beta.7 → 1.2.0-beta.8

package/dist/cli/services/dev/workers/app-worker.d.ts

@@ -1,7 +1,6 @@
-import { type Cli } from '@youcan/cli-kit';
-import AbstractWorker from './abstract-worker';
+import { type Cli, Worker } from '@youcan/cli-kit';
 import type { App } from '@/types';
-export default class AppWorker extends AbstractWorker {
+export default class AppWorker extends Worker.Abstract {
     private command;
     private app;
     private logger;

package/dist/cli/services/dev/workers/app-worker.js

@@ -1,8 +1,7 @@
-import { Color, Filesystem, Path } from '@youcan/cli-kit';
-import AbstractWorker, { WorkerLogger } from './abstract-worker.js';
+import { Worker, Color, Filesystem, Path } from '@youcan/cli-kit';
 import { APP_CONFIG_FILENAME } from '../../../../constants.js';
 
-class AppWorker extends AbstractWorker {
+class AppWorker extends Worker.Abstract {
     command;
     app;
     logger;
@@ -10,7 +9,7 @@ class AppWorker extends AbstractWorker {
         super();
         this.command = command;
         this.app = app;
-        this.logger = new WorkerLogger('stdout', 'app', Color.cyan);
+        this.logger = new Worker.Logger('stdout', 'app', Color.cyan);
     }
     async boot() {
     }

package/dist/cli/services/dev/workers/index.d.ts

@@ -1,14 +1,10 @@
-import type { Cli } from '@youcan/cli-kit';
+import type { Cli, Worker } from '@youcan/cli-kit';
 import WebWorker from './web-worker';
 import AppWorker from './app-worker';
 import type { App, Extension, Web } from '@/types';
 export interface ExtensionWorkerCtor {
-    new (command: Cli.Command, app: App, extension: Extension): Worker;
-}
-export interface Worker {
-    run(): Promise<void>;
-    boot(): Promise<void>;
+    new (command: Cli.Command, app: App, extension: Extension): Worker.Interface;
 }
 export declare function bootAppWorker(command: Cli.Command, app: App): Promise<AppWorker>;
-export declare function bootExtensionWorker(command: Cli.Command, app: App, extension: Extension): Promise<Worker>;
+export declare function bootExtensionWorker(command: Cli.Command, app: App, extension: Extension): Promise<Worker.Interface>;
 export declare function bootWebWorker(command: Cli.Command, app: App, web: Web): Promise<WebWorker>;

package/dist/cli/services/dev/workers/theme-extension-worker.d.ts

@@ -1,7 +1,7 @@
 import type { Cli } from '@youcan/cli-kit';
-import AbstractWorker from './abstract-worker';
+import { Worker } from '@youcan/cli-kit';
 import type { App, Extension } from '@/types';
-export default class ThemeExtensionWorker extends AbstractWorker {
+export default class ThemeExtensionWorker extends Worker.Abstract {
     private command;
     private app;
     private extension;

package/dist/cli/services/dev/workers/theme-extension-worker.js

@@ -1,7 +1,6 @@
-import { Color, Session, Http, Env, Path, Filesystem, Form } from '@youcan/cli-kit';
-import AbstractWorker, { WorkerLogger } from './abstract-worker.js';
+import { Worker, Color, Session, Http, Env, Path, Filesystem, Form } from '@youcan/cli-kit';
 
-class ThemeExtensionWorker extends AbstractWorker {
+class ThemeExtensionWorker extends Worker.Abstract {
     command;
     app;
     extension;
@@ -18,7 +17,7 @@ class ThemeExtensionWorker extends AbstractWorker {
         this.command = command;
         this.app = app;
         this.extension = extension;
-        this.logger = new WorkerLogger('stdout', 'extensions', Color.yellow);
+        this.logger = new Worker.Logger('stdout', 'extensions', Color.yellow);
     }
     async boot() {
         const session = await Session.authenticate(this.command);
@@ -98,13 +97,15 @@ class ThemeExtensionWorker extends AbstractWorker {
     }
     enqueue(op, type, name) {
         this.queue.push(async () => {
-            const path = Path.resolve(this.extension.root, type, name);
+            const path = Path.join(this.extension.root, type, name);
             await Http.post(`${Env.apiHostname()}/apps/draft/${this.app.config.id}/extensions/${this.extension.id}/file`, {
                 body: Form.convert({
                     file_name: name,
                     file_type: type,
                     file_operation: op,
-                    file_content: await Form.file(path),
+                    file_content: op === 'put'
+                        ? await Form.file(path)
+                        : undefined,
                 }),
             });
             this.logger.write(`[${op === 'put' ? 'updated' : 'deleted'}] - ${Path.join(type, name)}`);

package/dist/cli/services/dev/workers/web-worker.d.ts

@@ -1,7 +1,6 @@
-import { type Cli } from '@youcan/cli-kit';
-import AbstractWorker from './abstract-worker';
+import { type Cli, Worker } from '@youcan/cli-kit';
 import type { App, Web } from '@/types';
-export default class WebWorker extends AbstractWorker {
+export default class WebWorker extends Worker.Abstract {
     private command;
     private app;
     private web;

package/dist/cli/services/dev/workers/web-worker.js

@@ -1,7 +1,6 @@
-import { Color, System } from '@youcan/cli-kit';
-import AbstractWorker, { WorkerLogger } from './abstract-worker.js';
+import { Worker, Color, System } from '@youcan/cli-kit';
 
-class WebWorker extends AbstractWorker {
+class WebWorker extends Worker.Abstract {
     command;
     app;
     web;
@@ -11,7 +10,7 @@ class WebWorker extends AbstractWorker {
         this.command = command;
         this.app = app;
         this.web = web;
-        this.logger = new WorkerLogger('stderr', this.web.config.name || 'web', Color.blue);
+        this.logger = new Worker.Logger('stderr', this.web.config.name || 'web', Color.blue);
     }
     async boot() {
     }
@@ -20,7 +19,7 @@ class WebWorker extends AbstractWorker {
         return System.exec(cmd, args, {
             stdout: this.logger,
             signal: this.command.controller.signal,
-            stderr: new WorkerLogger('stderr', this.web.config.name || 'web', Color.red),
+            stderr: new Worker.Logger('stderr', this.web.config.name || 'web', Color.red),
         });
     }
 }

package/dist/util/app-loader.js

@@ -3,7 +3,7 @@ import { APP_CONFIG_FILENAME, DEFAULT_EXTENSIONS_DIR, EXTENSION_CONFIG_FILENAME,
 
 async function load() {
     const path = Path.resolve(Path.cwd(), APP_CONFIG_FILENAME);
-    if (!await Filesystem.exists) {
+    if (!await Filesystem.exists(path)) {
         throw new Error(`app config not found at ${path}`);
     }
     const config = await Filesystem.readJsonFile(path);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/app",
   "type": "module",
-  "version": "1.2.0-beta.7",
+  "version": "1.2.0-beta.8",
   "description": "OCLIF plugin for building apps",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "license": "MIT",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@oclif/core": "^2.15.0",
     "dayjs": "^1.11.10",
-    "@youcan/cli-kit": "1.2.0-beta.7"
+    "@youcan/cli-kit": "1.2.0-beta.8"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",

package/dist/cli/services/dev/workers/abstract-worker.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-import { Writable } from 'stream';
-import type { Color } from '@youcan/cli-kit';
-import type { Worker } from './index';
-export declare class WorkerLogger extends Writable {
-    private channel;
-    private type;
-    private color;
-    constructor(channel: 'stdout' | 'stderr', type: string, color: Color.Color);
-    write(chunk: unknown): boolean;
-    private pad;
-}
-export default abstract class AbstractWorker implements Worker {
-    abstract boot(): Promise<void>;
-    abstract run(): Promise<void>;
-}

package/dist/cli/services/dev/workers/abstract-worker.js

@@ -1,36 +0,0 @@
-import { Writable } from 'node:stream';
-import { stdout, stderr } from 'node:process';
-import dayjs from 'dayjs';
-
-class WorkerLogger extends Writable {
-    channel;
-    type;
-    color;
-    constructor(channel, type, color) {
-        super();
-        this.channel = channel;
-        this.type = type;
-        this.color = color;
-    }
-    write(chunk) {
-        if (!(chunk instanceof Buffer) && typeof chunk !== 'string') {
-            return false;
-        }
-        const channel = this.channel === 'stdout' ? stdout : stderr;
-        const time = dayjs().format('HH:mm:ss:SSS');
-        const lines = chunk.toString().split('\n').map(s => s.trim()).filter(s => s !== '');
-        for (let i = 0; i < lines.length; i++) {
-            i === 0
-                ? channel.write(this.color(`${time} | ${this.pad(this.type, 10)} | ${lines[i]}\n`))
-                : channel.write(this.color(`                       | ${lines[i]}\n`));
-        }
-        return true;
-    }
-    pad(subject, length, char = ' ') {
-        return subject.padEnd(length, char);
-    }
-}
-class AbstractWorker {
-}
-
-export { WorkerLogger, AbstractWorker as default };