mechanica 1.0.12 → 1.0.14

package/bin/compile.js

@@ -169,7 +169,8 @@ async function* generateProject(options) {
         }
       });
     });
-    const html = await generatePage({ ...options, state: page, path: page.path });
+    const assetsUrl = options.assetsUrl ?? (options.baseUrl && options.baseUrl !== "/" ? options.baseUrl + "/assets/" : void 0);
+    const html = await generatePage({ ...options, assetsUrl, state: page, path: page.path });
     yield [html, page.path];
   }
 }
@@ -179,6 +180,9 @@ const getBlockName = (path) => {
   return (str == null ? void 0 : str.split(".", 1)[0].replace(/([A-Z])/g, " $1").trimStart()) ?? "Unnamed block";
 };
 const aliases$1 = {};
+const registerAlias$1 = (key, item) => {
+  aliases$1[key] = item;
+};
 const baseTypes = ["string", "boolean", "number", "integer", "bigint", "object", "array"];
 const isBaseType = (key) => {
   return baseTypes.some((item) => item === key || item + "?" === key || item + "??" === key);
@@ -279,12 +283,13 @@ const aliases = {};
 const registerAlias = (key, item) => {
   aliases[key] = item;
 };
-const registerAliases = () => {
-  registerAlias("image", { type: "object", format: "image", properties: { src: "string", previewSrc: "string?" } });
-  registerAlias("file", { type: "object", format: "file", properties: { src: "string" } });
-  registerAlias("color", { type: "string", format: "color" });
-  registerAlias("smartLink", { type: "object", format: "smartLink", properties: { url: "string", title: "string", external: "boolean" } });
-  registerAlias("richText", {
+const registerAliases = (registerCallback) => {
+  const registerAlias$12 = registerCallback ?? registerAlias;
+  registerAlias$12("image", { type: "object", format: "image", properties: { src: "string", previewSrc: "string?" } });
+  registerAlias$12("file", { type: "object", format: "file", properties: { src: "string" } });
+  registerAlias$12("color", { type: "string", format: "color" });
+  registerAlias$12("smartLink", { type: "object", format: "smartLink", properties: { url: "string", title: "string", external: "boolean" } });
+  registerAlias$12("richText", {
     type: "array",
     format: "richText",
     items: { type: "object", properties: { text: "string", type: "string?", styles: "object?" } }
@@ -356,11 +361,38 @@ const getAvailablePages = async (options) => {
 };
 const compile = async () => {
   console.info("Build client files...");
-  registerAliases();
+  registerAliases(registerAlias$1);
   process.env.DISABLE_HTML_GENERATE = "true";
+  let baseUrl = "/";
+  let assetsUrl = void 0;
+  let uploadsUrl = "/mech-assets";
+  for (let argv of process.argv) {
+    if (argv.startsWith("--base")) {
+      baseUrl = argv.split("=")[1];
+      if (!baseUrl) {
+        return console.error(`Use --base=/path`);
+      }
+    }
+    if (argv.startsWith("--assets-dir")) {
+      assetsUrl = argv.split("=")[1];
+      if (!assetsUrl) {
+        return console.error(`Use --assets-dir=/path`);
+      }
+      if (!assetsUrl.endsWith("/")) {
+        assetsUrl = assetsUrl + "/";
+      }
+    }
+    if (argv.startsWith("--uploads-dir")) {
+      uploadsUrl = argv.split("=")[1].replace(/\/+$/, "");
+      if (!uploadsUrl) {
+        return console.error(`Use --uploads-dir=/path`);
+      }
+    }
+  }
+  let assetsPath = (assetsUrl == null ? void 0 : assetsUrl.replace(/^\.?\/+/, "").replace(/\/+$/, "")) ?? "assets";
   fs.rmSync(`${process.cwd()}/export`, { recursive: true, force: true });
   fs.mkdirSync(`${process.cwd()}/export`, { recursive: true });
-  fs.cpSync(`${process.cwd()}/dist/assets`, `${process.cwd()}/export/assets`, { recursive: true });
+  fs.cpSync(`${process.cwd()}/dist/assets`, `${process.cwd()}/export/${assetsPath}`, { recursive: true });
   const index = fs.readFileSync(`${process.cwd()}/dist/index.html`, "utf-8");
   const pagesPath = "/.mech/pages";
   const window = { addEventListener() {
@@ -392,11 +424,11 @@ const compile = async () => {
   const copiedFiles = /* @__PURE__ */ new Set();
   const onFile = (imagePath) => {
     if (!hasUploadFolder) {
-      fs.mkdirSync(`${process.cwd()}/export/mech-assets`, { recursive: true });
+      fs.mkdirSync(`${process.cwd()}/export${uploadsUrl}`, { recursive: true });
       hasUploadFolder = true;
     }
     const path = imagePath.replace("@mechanica", ".mech");
-    const newPath = "/mech-assets" + imagePath.replace("/@mechanica", "").replace("/assets", "");
+    const newPath = uploadsUrl + imagePath.replace("/@mechanica", "").replace("/assets", "");
     if (!copiedFiles.has(newPath)) {
       copiedFiles.add(newPath);
       fs.copyFileSync(`${process.cwd()}${path}`, `${process.cwd()}/export/${newPath}`);
@@ -425,6 +457,8 @@ const compile = async () => {
     dataEntries: module.dataEntries,
     projectData: {},
     blocksMap,
+    baseUrl,
+    assetsUrl,
     queryResolver: getQuery,
     render,
     onFile

package/dist/editor.js

@@ -2,9 +2,8 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { defineComponent, ref, watch, createElementBlock, openBlock, normalizeStyle, createElementVNode, reactive, computed, shallowRef, onMounted, onBeforeUnmount, triggerRef, inject, normalizeClass, createCommentVNode, renderSlot, createVNode, createTextVNode, toDisplayString, Transition, withCtx, getCurrentScope, onScopeDispose, toRef as toRef$1, readonly, customRef, toValue as toValue$1, getCurrentInstance, nextTick, unref, createBlock, createSlots, withDirectives, vModelText, vModelDynamic, Fragment, renderList, h, TransitionGroup, useSlots, Teleport, mergeProps, withModifiers, mergeModels, useModel, createStaticVNode, resolveDynamicComponent, isRef, vShow, shallowReactive, vModelCheckbox, isProxy, toRaw, resolveComponent, normalizeProps, guardReactiveProps, provide, createApp } from "vue";
-import { p as passDefaultValue, d as defaultImageSrc, g as getDefaultValue, r as registerAliases } from "./schemaAliases-CX3SQvLF.js";
+import { p as passDefaultValue, d as defaultImageSrc, g as getDefaultValue, r as registerAliases, a as registerAlias, u as unfoldSchema } from "./schemaAliases-3G_-tJU0.js";
 import { blocksList as blocksList$1, addUpdateListener } from "virtual:builder-blocks";
-import { unfoldSchema } from "compact-json-schema";
 const _sfc_main$N = /* @__PURE__ */ defineComponent({
   __name: "HoverFrame",
   props: {
@@ -5716,7 +5715,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-registerAliases();
+registerAliases(registerAlias);
 const blocksList = shallowRef(blocksList$1.map((file) => ({
   ...file.blockSchema,
   id: file.blockSchema.id ?? file.__name,