@enspirit/emb 0.0.9 → 0.1.1

package/dist/src/cli/commands/up.js

@@ -1,7 +1,6 @@
 import { Flags } from '@oclif/core';
 import { FlavoredCommand, getContext } from '../index.js';
 import { ComposeUpOperation } from '../../docker/index.js';
-import { BuildComponentsOperation } from '../../monorepo/index.js';
 export default class UpCommand extends FlavoredCommand {
     static description = 'Start the whole project.';
     static enableJsonFlag = true;
@@ -17,9 +16,11 @@ export default class UpCommand extends FlavoredCommand {
     async run() {
         const { flags } = await this.parse(UpCommand);
         const { monorepo } = getContext();
-        await monorepo.run(new BuildComponentsOperation(), {
-            components: monorepo.components.map((c) => c.name),
-        });
+        const buildFlags = [];
+        if (flags.force) {
+            buildFlags.push('--force');
+        }
+        await this.config.runCommand('resources:build', buildFlags);
         await monorepo.run(new ComposeUpOperation(), {
             forceRecreate: flags.force,
         });

package/dist/src/cli/hooks/init.js

@@ -1,27 +1,2 @@
-import { setContext } from '../../index.js';
-import { Performance } from '@oclif/core';
-import Dockerode from 'dockerode';
-import { loadConfig } from '../../config/index.js';
-import { Monorepo } from '../../monorepo/index.js';
-const withMarker = async (owner, name, cb) => {
-    const marker = Performance.mark(owner, name);
-    const res = await cb();
-    marker?.stop();
-    return res;
-};
-const hook = async function (options) {
-    try {
-        const config = await withMarker('emb:config', 'load', () => loadConfig());
-        const monorepo = await withMarker('emb:monorepo', 'init', () => {
-            return new Monorepo(config).init();
-        });
-        setContext({
-            docker: new Dockerode(),
-            monorepo,
-        });
-    }
-    catch (error) {
-        options.context.error(error);
-    }
-};
+const hook = async function (_options) { };
 export default hook;

package/dist/src/cli/utils.d.ts

@@ -0,0 +1 @@
+export declare const getTimeAgo: (timestamp?: number) => string | undefined;

package/dist/src/cli/utils.js

@@ -0,0 +1,26 @@
+const DATE_UNITS = {
+    day: 86_400,
+    hour: 3600,
+    minute: 60,
+    second: 1,
+};
+const getSecondsDiff = (timestamp) => (Date.now() - timestamp) / 1000;
+const getUnitAndValueDate = (secondsElapsed) => {
+    for (const [unit, secondsInUnit] of Object.entries(DATE_UNITS)) {
+        if (secondsElapsed >= secondsInUnit || unit === 'second') {
+            const value = Math.floor(secondsElapsed / secondsInUnit) * -1;
+            return { value, unit: unit };
+        }
+    }
+    const value = Math.floor(secondsElapsed / DATE_UNITS.day) * -1;
+    return { value, unit: 'day' };
+};
+export const getTimeAgo = (timestamp) => {
+    if (!timestamp) {
+        return;
+    }
+    const rtf = new Intl.RelativeTimeFormat();
+    const secondsElapsed = getSecondsDiff(timestamp * 1000);
+    const { value, unit } = getUnitAndValueDate(secondsElapsed);
+    return rtf.format(value, unit);
+};

package/dist/src/config/convert.d.ts

@@ -1,4 +1,2 @@
-import { Flavor } from './schema.js';
-import { FlavorConfig, IMonorepoConfig, UserConfig } from './types.js';
-export declare const toFlavor: (flavor: Flavor) => FlavorConfig;
-export declare const toProjectConfig: (config: UserConfig, rootDir?: string) => IMonorepoConfig;
+import { EMBConfig, UserConfig } from './types.js';
+export declare const toUserConfig: (config: EMBConfig, rootDir?: string) => UserConfig;

package/dist/src/config/convert.js

@@ -1,41 +1,18 @@
 import { resolve } from 'node:path';
 import { cwd } from 'node:process';
-export const toFlavor = (flavor) => {
-    return {
-        ...flavor,
-        components: flavor.components,
+export const toUserConfig = (config, rootDir) => {
+    const project = {
+        ...config.project,
+        rootDir: config.project.rootDir
+            ? rootDir
+                ? resolve(rootDir, config.project.rootDir)
+                : config.project.rootDir
+            : rootDir || cwd(),
     };
-};
-export const toProjectConfig = (config, rootDir) => {
-    const project = typeof config.project === 'string'
-        ? { name: config.project }
-        : config.project;
-    if (project.rootDir) {
-        project.rootDir = rootDir
-            ? resolve(rootDir, project.rootDir)
-            : project.rootDir;
-    }
-    else {
-        project.rootDir = rootDir || cwd();
-    }
-    const components = config.components || [];
-    const { defaults, flavors, ...rest } = config;
     return {
-        ...rest,
-        components,
-        defaults: {
-            ...defaults,
-            docker: {
-                ...defaults?.docker,
-                labels: {
-                    ...defaults?.docker?.labels,
-                    'emb/project': project.name,
-                },
-            },
-        },
-        flavors: flavors?.map(toFlavor),
-        project: {
-            ...project,
-        },
+        ...config,
+        components: config.components || {},
+        flavors: config.flavors || {},
+        project,
     };
 };

package/dist/src/config/index.d.ts

@@ -1,7 +1,6 @@
-import { IMonorepoConfig } from './types.js';
+import { UserConfig } from './types.js';
 export * from './convert.js';
-export * from './schema.js';
 export * from './types.js';
 export * from './validation.js';
-export declare const loadConfig: (force?: boolean) => Promise<IMonorepoConfig>;
-export declare const getConfig: () => IMonorepoConfig;
+export declare const loadConfig: (force?: boolean) => Promise<UserConfig>;
+export declare const getConfig: () => UserConfig;

package/dist/src/config/index.js

@@ -1,9 +1,8 @@
 import { findUp } from 'find-up';
 import { dirname } from 'node:path';
-import { toProjectConfig } from './convert.js';
+import { toUserConfig } from './convert.js';
 import { validateUserConfig } from './validation.js';
 export * from './convert.js';
-export * from './schema.js';
 export * from './types.js';
 export * from './validation.js';
 let config;
@@ -15,7 +14,7 @@ export const loadConfig = async (force = false) => {
     if (!path) {
         throw new Error('Could not find EMB config anywhere');
     }
-    config = toProjectConfig(await validateUserConfig(path), dirname(path));
+    config = toUserConfig(await validateUserConfig(path), dirname(path));
     return config;
 };
 export const getConfig = () => {

package/dist/src/config/schema.d.ts

@@ -3,21 +3,30 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run json-schema-to-typescript to regenerate this file.
  */
-export type Task = Task1 & {
-    name: string;
+export type Identifier = string;
+export type TaskConfig = TaskConfig1 & {
     description?: string;
     script?: string;
-    executor?: string;
+    executor?: Identifier;
     options?: {
         [k: string]: unknown;
     };
-    pre?: string[];
+    pre?: Identifier[];
 };
-export type Task1 = {
+export type TaskConfig1 = {
     [k: string]: unknown;
 };
-export interface EMBConfigSchema {
-    project: string | {
+export type ResourceConfig = {
+    [k: string]: unknown;
+} & {
+    type: string;
+    params?: unknown;
+    dependencies?: QualifiedIdentifier[];
+};
+export type QualifiedIdentifier = string;
+export type JsonPatchOperation = JsonPatchAddOperation | JsonPatchRemoveOperation | JsonPatchReplaceOperation | JsonPatchMoveOperation | JsonPatchCopyOperation;
+export interface EMBConfig {
+    project: {
         /**
          * The name of the project.
          */
@@ -28,7 +37,7 @@ export interface EMBConfigSchema {
         rootDir?: string;
     };
     plugins?: {
-        name: string;
+        name: Identifier;
         config?: unknown;
     }[];
     /**
@@ -43,21 +52,27 @@ export interface EMBConfigSchema {
     vars?: {
         [k: string]: unknown;
     };
-    defaults?: Defaults;
-    components?: Component[];
-    flavors?: Flavor[];
-    tasks?: Task[];
+    defaults?: DefaultsConfig;
+    components?: {
+        [k: string]: ComponentConfig;
+    };
+    flavors?: {
+        [k: string]: ProjectFlavorConfig;
+    };
+    tasks?: {
+        [k: string]: TaskConfig;
+    };
 }
 /**
  * Default settings for build aspects
  */
-export interface Defaults {
+export interface DefaultsConfig {
     /**
      * Default docker build settings
      */
     docker?: {
         tag?: string;
-        target?: string;
+        target?: Identifier;
         buildArgs?: {
             [k: string]: string;
         };
@@ -67,43 +82,53 @@ export interface Defaults {
         [k: string]: unknown;
     };
 }
-export interface Component {
+export interface ComponentConfig {
     /**
-     * The name of the component.
+     * Path to the component's root folder (relative to root of monorepo)
      */
-    name: string;
-    docker?: {
-        /**
-         * The directory of the component.
-         */
-        context?: string;
-        buildArgs?: {
-            [k: string]: string;
-        };
-        dependencies?: string[];
-        /**
-         * The stage to target for the build
-         */
-        target?: string;
-        /**
-         * The Dockerfile to use
-         */
-        dockerfile?: string;
-    };
+    rootDir?: string;
     /**
      * A description of the component.
      */
     description?: string;
-    tasks?: Task[];
-}
-export interface Flavor {
-    name: string;
-    /**
-     * Variables to install on the environment
-     */
-    env?: {
-        [k: string]: string;
+    tasks?: {
+        [k: string]: TaskConfig;
+    };
+    resources?: {
+        [k: string]: ResourceConfig;
     };
-    components?: Component[];
-    defaults?: Defaults;
+    flavors?: {
+        [k: string]: ComponentFlavorConfig;
+    };
+}
+export interface ComponentFlavorConfig {
+    patches?: JsonPatchOperation[];
+}
+export interface JsonPatchAddOperation {
+    op: "add";
+    path: string;
+    value: unknown;
+}
+export interface JsonPatchRemoveOperation {
+    op: "remove";
+    path: string;
+}
+export interface JsonPatchReplaceOperation {
+    op: "replace";
+    path: string;
+    value: unknown;
+}
+export interface JsonPatchMoveOperation {
+    op: "move";
+    path: string;
+    from: string;
+}
+export interface JsonPatchCopyOperation {
+    op: "copy";
+    path: string;
+    from: string;
+}
+export interface ProjectFlavorConfig {
+    defaults?: DefaultsConfig;
+    patches?: JsonPatchOperation[];
 }