@youcan/app 2.1.4 → 2.3.0

package/dist/types.d.ts

@@ -1,69 +1,84 @@
-export interface InitialAppConfig {
-    [key: string]: unknown;
-    name: string;
-}
-export type AppConfig = {
-    id: string;
-    app_url: string;
-    redirect_urls: string[];
-    oauth: {
-        client_id: string;
-        scopes: string[];
-    };
-} & InitialAppConfig;
-export interface ExtensionConfig {
-    [key: string]: unknown;
-    type: string;
-    name: string;
-}
-export interface ExtensionFlavor {
-    name: string;
-    path?: string;
-    value: 'liquid';
-}
-export interface ExtensionTemplateType {
-    url: string;
-    type: string;
-    flavors: ExtensionFlavor[];
-}
-export interface ExtensionTemplate {
-    identifier: string;
-    name: string;
-    description: string;
-    types: ExtensionTemplateType[];
-}
-export interface Extension {
-    id?: string;
-    metadata?: ExtensionMetadata;
-    root: string;
-    config: ExtensionConfig;
-}
-export interface WebConfig {
-    name?: string;
-    commands: {
-        dev: string;
-        build?: string;
-    };
-}
-export interface Web {
-    root: string;
-    config: WebConfig;
-    framework?: string;
-}
-export interface App {
-    root: string;
-    webs: Web[];
-    config: AppConfig;
-    extensions: Extension[];
-}
-export interface ExtensionFileDescriptor {
-    id: string;
-    type: string;
-    name: string;
-    file_name: string;
-    size: number;
-    hash: string;
-}
-export interface ExtensionMetadata {
-    [key: string]: ExtensionFileDescriptor[];
-}
+export interface InitialAppConfig {
+    [key: string]: unknown;
+    name: string;
+}
+export type AppConfig = {
+    id: string;
+    app_url: string;
+    redirect_urls: string[];
+    oauth: {
+        client_id: string;
+        scopes: string[];
+    };
+} & InitialAppConfig;
+export interface RemoteAppConfig {
+    id: string;
+    name: string;
+    app_url: string;
+    owner_id: string;
+    client_id: string;
+    client_secret: string;
+    redirect_urls: string[];
+    scopes: string[];
+}
+export interface ExtensionConfig {
+    [key: string]: unknown;
+    type: string;
+    name: string;
+}
+export interface ExtensionFlavor {
+    name: string;
+    path?: string;
+    value: 'liquid';
+}
+export interface ExtensionTemplateType {
+    url: string;
+    type: string;
+    flavors: ExtensionFlavor[];
+}
+export interface ExtensionTemplate {
+    identifier: string;
+    name: string;
+    description: string;
+    types: ExtensionTemplateType[];
+}
+export interface Extension {
+    id?: string;
+    metadata?: ExtensionMetadata;
+    root: string;
+    config: ExtensionConfig;
+}
+export interface WebConfig {
+    name?: string;
+    commands: {
+        dev: string;
+        build?: string;
+    };
+}
+export interface Web {
+    root: string;
+    config: WebConfig;
+    framework?: string;
+}
+export interface App {
+    root: string;
+    webs: Web[];
+    config: AppConfig;
+    remoteConfig?: RemoteAppConfig;
+    networkConfig?: {
+        appUrl: string;
+        port: number;
+    };
+    extensions: Extension[];
+}
+export interface ExtensionFileDescriptor {
+    id: string;
+    type: string;
+    name: string;
+    file_name: string;
+    size: number;
+    hash: string;
+}
+export interface ExtensionMetadata {
+    [key: string]: ExtensionFileDescriptor[];
+}

package/dist/util/app-command.d.ts

@@ -0,0 +1,8 @@
+import type { Session } from '@youcan/cli-kit';
+import { Cli } from '@youcan/cli-kit';
+import type { App } from '@/types';
+export declare abstract class AppCommand extends Cli.Command {
+    protected app: App;
+    protected session: Session.StoreSession;
+    syncAppConfig(): Promise<App>;
+}

package/dist/util/app-command.js

@@ -0,0 +1,41 @@
+import { Cli, Env, Http, Filesystem, Path } from '@youcan/cli-kit';
+import { APP_CONFIG_FILENAME } from '../constants.js';
+
+class AppCommand extends Cli.Command {
+    app;
+    session;
+    async syncAppConfig() {
+        const endpoint = this.app.config.id == null
+            ? `${Env.apiHostname()}/apps/create`
+            : `${Env.apiHostname()}/apps/${this.app.config.id}/update`;
+        if (!this.app.networkConfig) {
+            throw new Error('app network config is not set');
+        }
+        const backUrl = new URL('/auth/callback', this.app.networkConfig.appUrl).toString();
+        const res = await Http.post(endpoint, {
+            headers: { Authorization: `Bearer ${this.session.access_token}` },
+            body: JSON.stringify({
+                name: this.app.config.name,
+                app_url: this.app.networkConfig.appUrl,
+                redirect_urls: [
+                    backUrl,
+                ],
+            }),
+        });
+        this.app.config = {
+            name: res.name,
+            id: res.id,
+            app_url: res.app_url,
+            redirect_urls: res.redirect_urls,
+            oauth: {
+                scopes: res.scopes,
+                client_id: res.client_id,
+            },
+        };
+        await Filesystem.writeJsonFile(Path.join(this.app.root, APP_CONFIG_FILENAME), this.app.config);
+        this.app.remoteConfig = res;
+        return this.app;
+    }
+}
+
+export { AppCommand };

package/dist/util/app-loader.d.ts

@@ -1,2 +1,2 @@
-import type { App } from '@/types';
-export declare function load(): Promise<App>;
+import type { App } from '@/types';
+export declare function load(): Promise<App>;

package/dist/util/app-loader.js

@@ -1,41 +1,41 @@
 import { Path, Filesystem } from '@youcan/cli-kit';
 import { APP_CONFIG_FILENAME, DEFAULT_EXTENSIONS_DIR, EXTENSION_CONFIG_FILENAME, DEFAULT_WEBS_DIR, WEB_CONFIG_FILENAME } from '../constants.js';
 
-async function load() {
-    const path = Path.resolve(Path.cwd(), APP_CONFIG_FILENAME);
-    if (!await Filesystem.exists(path)) {
-        throw new Error(`app config not found at ${path}`);
-    }
-    const config = await Filesystem.readJsonFile(path);
-    const app = {
-        config,
-        webs: [],
-        extensions: [],
-        root: Path.cwd(),
-    };
-    app.extensions = await loadExtensions(app);
-    app.webs = await loadWebs(app);
-    return app;
-}
-async function loadExtensions(app) {
-    const pattern = Path.join(app.root, `${DEFAULT_EXTENSIONS_DIR}/*`, EXTENSION_CONFIG_FILENAME);
-    const paths = await Filesystem.glob(pattern);
-    const promises = paths.map(async (p) => {
-        return {
-            root: Path.dirname(p),
-            config: await Filesystem.readJsonFile(p),
-        };
-    });
-    return await Promise.all(promises);
-}
-async function loadWebs(app) {
-    const pattern = Path.join(app.root, DEFAULT_WEBS_DIR, WEB_CONFIG_FILENAME);
-    const paths = await Filesystem.glob(pattern);
-    const promises = paths.map(async (p) => ({
-        root: Path.dirname(p),
-        config: await Filesystem.readJsonFile(p),
-    }));
-    return await Promise.all(promises);
+async function load() {
+    const path = Path.resolve(Path.cwd(), APP_CONFIG_FILENAME);
+    if (!await Filesystem.exists(path)) {
+        throw new Error(`app config not found at ${path}`);
+    }
+    const config = await Filesystem.readJsonFile(path);
+    const app = {
+        config,
+        webs: [],
+        extensions: [],
+        root: Path.cwd(),
+    };
+    app.extensions = await loadExtensions(app);
+    app.webs = await loadWebs(app);
+    return app;
+}
+async function loadExtensions(app) {
+    const pattern = Path.join(app.root, `${DEFAULT_EXTENSIONS_DIR}/*`, EXTENSION_CONFIG_FILENAME);
+    const paths = await Filesystem.glob(pattern);
+    const promises = paths.map(async (p) => {
+        return {
+            root: Path.dirname(p),
+            config: await Filesystem.readJsonFile(p),
+        };
+    });
+    return await Promise.all(promises);
+}
+async function loadWebs(app) {
+    const pattern = Path.join(app.root, DEFAULT_WEBS_DIR, WEB_CONFIG_FILENAME);
+    const paths = await Filesystem.glob(pattern);
+    const promises = paths.map(async (p) => ({
+        root: Path.dirname(p),
+        config: await Filesystem.readJsonFile(p),
+    }));
+    return await Promise.all(promises);
 }
 
 export { load };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/app",
   "type": "module",
-  "version": "2.1.4",
+  "version": "2.3.0",
   "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": "2.1.4"
+    "@youcan/cli-kit": "2.3.0"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",
@@ -25,7 +25,12 @@
     "shx": "^0.3.4"
   },
   "oclif": {
-    "commands": "./dist/cli/commands"
+    "commands": "./dist/cli/commands",
+    "topics": {
+      "app:env": {
+        "description": "Manage app environment variables"
+      }
+    }
   },
   "scripts": {
     "build": "shx rm -rf dist && tsc --noEmit && rollup --config rollup.config.js",

package/dist/util/theme-command.d.ts

@@ -1,3 +0,0 @@
-import { Cli } from '@youcan/cli-kit';
-export declare abstract class AppCommand extends Cli.Command {
-}

package/dist/util/theme-command.js

@@ -1,6 +0,0 @@
-import { Cli } from '@youcan/cli-kit';
-
-class AppCommand extends Cli.Command {
-}
-
-export { AppCommand };