@vcmap/plugin-cli 4.0.0-rc.5 → 4.0.1

package/README.md

@@ -2,9 +2,9 @@
 
 > Part of the [VC Map Project](https://github.com/virtualcitySYSTEMS/map-ui)
 
-> **Note: This documentation is for version 2, compatible with the [VC Map](https://github.com/virtualcitySYSTEMS/map-ui) v5.
-> For documentation on version 1 compatible with VC Map v4, see [this tag](https://github.com/virtualcitySYSTEMS/map-plugin-cli/tree/v1.1.1)
-> and be sure to install using `npm i -g @vcmap/plugin-cli@^1.1.0`**
+> Note: This documentation is for version @vcmap/ui 6.0.0, compatible with the [VC Map](https://github.com/virtualcitySYSTEMS/map-ui).
+>
+> [Migration Guide](https://github.com/virtualcitySYSTEMS/map-ui/blob/release-v6.0/MIGRATION_V6.md) for Plugins from @vcmap/ui 5.0.0
 
 The `@vcmap/plugin-cli` helps develop and build plugins for the **VC Map**.
 
@@ -18,7 +18,7 @@ The `@vcmap/plugin-cli` helps develop and build plugins for the **VC Map**.
 
 ## Prerequisite
 
-You need [nodejs](https://nodejs.org/en/) 18 and npm installed on your system
+You need [nodejs](https://nodejs.org/en/) 20 and npm installed on your system
 to use this tool.
 
 ## Installation
@@ -161,21 +161,25 @@ To build your project, run the following from within your projects root:
 npx vcmplugin build
 ```
 
-This will build your application and place it in the `dist` directory.
+This will build your plugin and place it in the `dist` directory.
 
 ### 6. Integrating a plugin in a productive VC MAP
 
-To pack your project for productive use, run the following from within your projects root:
+To bundle your project for productive use, run the following from within your projects root:
 
 ```bash
-npx vcmplugin pack
+npx vcmplugin bundle
 ```
 
-This will create a folder `dist` with a zip file containing your bundled code and assets.
-To use the plugin productively in a hosted map,
-unzip this file on your server to `{vcm-root}/plugins` and add
-an entry to your VC MAP `config` plugins section. This zip file can also be unzipped
-in the VC Publishers `plugins` public directory.
+This will create a `dist` folder with your bundled code and assets.
+
+Using the VC Publisher you can simply upload the `tar.gz` file from the dist folder within your administration "Map Plugins" tab.
+Afterward you can add the plugin to your app using the app-configurator.
+
+Without using the VC Publisher you can also deploy a plugin manually:
+
+- Unzip the `tar.gz` on a server
+- Add the plugin to a module configuration plugins section, specifying a `name` and `entry` property (path to the plugin location)
 
 ## vcm config js
 
@@ -339,22 +343,33 @@ configuration of the plugin as its first argument and the base URL (without the
 from which the plugin was loaded as its second argument.
 
 ```typescript
-declare type PluginConfigEditor = {
-  component: VueComponent;
+declare type PluginConfigEditorComponent<C extends Object> = VueComponent<{
+  getConfig(): C;
+  setConfig(config?: C): void;
+}>;
+
+declare type PluginConfigEditor<C extends Object> = {
+  component: PluginConfigEditorComponent<C>;
+  title?: string;
   collectionName?: string;
   itemName?: string;
+  infoUrlCallback?: () => string;
 };
 
 declare interface VcsPlugin<T extends Object, S extends Object> {
   readonly name: string;
   readonly version: string;
-  initialize(app: VcsUiApp, state?: S): Promise<void>;
-  onVcsAppMounted(app: VcsUiApp): Promise<void>;
-  getState(): Promise<S>;
-  toJSON(): Promise<T>;
-  getDefaultOptions(): T;
-  getConfigEditors(): Array<PluginConfigEditor>;
-  destroy(): void;
+  readonly mapVersion: string;
+  i18n?: {
+    [x: string]: unknown;
+  };
+  initialize?: (app: VcsUiApp, state?: S) => Promise<void>;
+  onVcsAppMounted?: (app: VcsUiApp) => Promise<void>;
+  toJSON?: () => T;
+  getDefaultOptions?: () => T;
+  getState?: () => S | Promise<S>;
+  getConfigEditors?: () => Array<PluginConfigEditor<object>>;
+  destroy?: () => void;
 }
 
 declare function defaultExport<T extends Object, S extends Object>(
@@ -402,6 +417,95 @@ export default function defaultExport(config, baseUrl) {
 }
 ```
 
+### Plugin Config Editor
+
+Part of the [plugin interface](#plugin-interface) is the option to provide one or more custom config editors.
+These config editors will be used in the VC Publisher to define the configuration of a plugin or a plugin custom class, like a custom layer or feature info.
+If a plugin does not provide a config editor, the JsonEditor is always used as fallback.
+
+To provide a custom editor, the plugin has to implement a `getConfigEditors` method returning one or more editors.
+A plugin config editor definition consists of
+
+- component: The vue component providing the ui of the editor. This vue component has to extend the `AbstractConfigEditor.vue`, which can be imported from `@vcmap/ui`. The component has to provide two props: `getConfig` for getting the serialized configuration and `setConfig` to update the changed configuration.
+- title: An optional title displayed in the window header of the editor and on action buttons (e.g. tooltip)
+- collectionName: The collection the item belongs to. Default is `plugins` collection. For a layer config editor you would provide `layers`.
+- itemName: The item the editor can be used for. Can be a name or className. Default is the plugin's name. For a layer you would provide `MyNewLayer.className`.
+- infoUrlCallback: An optional function returning an url referencing help or further information regarding the config editor.
+
+An example of plugin config editor can look like this:
+
+```vue
+<template>
+  <AbstractConfigEditor @submit="apply" v-bind="{ ...$attrs, ...$props }">
+    <VcsFormSection heading="general" expandable :start-open="true">
+      <v-container class="py-0 px-1">
+        <v-row no-gutters>
+          <v-col>
+            <VcsLabel html-for="someProp">
+              {{ $t('myPlugin.someProp') }}
+            </VcsLabel>
+          </v-col>
+          <v-col>
+            <VcsTextField id="someProp" v-model="localConfig.someProp" />
+          </v-col>
+        </v-row>
+      </v-container>
+    </VcsFormSection>
+  </AbstractConfigEditor>
+</template>
+
+<script>
+  import { VContainer, VRow, VCol } from 'vuetify/components';
+  import {
+    AbstractConfigEditor,
+    VcsFormSection,
+    VcsLabel,
+    VcsTextField,
+  } from '@vcmap/ui';
+  import { ref } from 'vue';
+  import { getDefaultOptions } from '../defaultOptions.js';
+
+  export default {
+    name: 'MyPluginConfigEditor',
+    components: {
+      VContainer,
+      VRow,
+      VCol,
+      AbstractConfigEditor,
+      VcsFormSection,
+      VcsLabel,
+      VcsTextField,
+    },
+    props: {
+      getConfig: {
+        type: Function,
+        required: true,
+      },
+      setConfig: {
+        type: Function,
+        required: true,
+      },
+    },
+    setup(props) {
+      const defaultOptions = getDefaultOptions();
+      const config = props.getConfig();
+      const localConfig = ref({ ...defaultOptions, ...config });
+
+      const apply = () => {
+        props.setConfig(localConfig.value);
+      };
+
+      return {
+        localConfig,
+        apply,
+      };
+    },
+  };
+</script>
+
+<style scoped></style>
+```
+
 ### About Plugin Assets
 
 Plugin assets are considered to be static files, such as images, fonts etc. which shall be

package/assets/testsTypescript/vcsPluginInterface.spec.ts

@@ -9,18 +9,16 @@ function sleep(ms = 0): Promise<void> {
   });
 }
 
-type TestPluginInstance = VcsPlugin<Record<never, never>, Record<never, never>>;
+type TestPluginInstance = VcsPlugin<object, object>;
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
+// @ts-expect-error: not defined on global
 window.VcsPluginLoaderFunction = (
   name: string,
   module: string,
 ): {
   default: () => TestPluginInstance;
 } => ({
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
+  // @ts-expect-error: interface may not use this
   default: () => plugin({ name }, module),
 });
 

package/assets/vitest.config.js

@@ -17,8 +17,7 @@ const configTest = defineConfig({
     },
     environment: 'jsdom',
     setupFiles: ['tests/setup.js'],
-    isolate: false,
-    threads: false,
+    pool: 'forks',
   },
 });
 export default configTest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/plugin-cli",
-  "version": "4.0.0-rc.5",
+  "version": "4.0.1",
   "description": "A CLI to help develop and build plugins for the VC Map",
   "main": "index.js",
   "type": "module",
@@ -31,19 +31,19 @@
   "dependencies": {
     "@vcmap/rollup-plugin-vcs-ol": "^1.0.2",
     "@vcsuite/cli-logger": "^1.0.0",
-    "@vitejs/plugin-vue": "^5.1.3",
+    "@vitejs/plugin-vue": "^5.1.4",
     "commander": "^10.0.1",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "prompts": "^2.4.2",
-    "sass": "^1.77.1",
+    "sass": "^1.80.2",
     "semver": "^7.5.4",
     "tar": "^7.4.3",
-    "vite": "^5.4.3",
+    "vite": "^5.4.9",
     "vite-plugin-vuetify": "^2.0.4"
   },
   "peerDependencies": {
-    "@vcmap/ui": "^6.0.0-rc.7",
-    "vue": "~3.4.27"
+    "@vcmap/ui": "^6.0.0",
+    "vue": "~3.4.38"
   },
   "peerDependenciesMeta": {
     "@vcmap/ui": {

package/src/serve.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { readFile } from 'fs/promises';
+import { lstat, readFile } from 'fs/promises';
 import { createServer } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import express from 'express';
@@ -101,6 +101,8 @@ export default async function serve(options) {
   const mergedOptions = { ...vcmConfigJs, ...options };
 
   await printVcmapUiVersion();
+  const uiLStat = await lstat(resolveMapUi());
+
   /*
   // In case @vcmap/ui is linked via git+ssh, dist folder is not available and must be built first
   // Currently not needed, keep it here if the same problem happens again
@@ -147,6 +149,7 @@ export default async function serve(options) {
         tinyqueue: 'tinyqueue/tinyqueue.js',
       },
       dedupe: Object.keys(peerDependencies),
+      preserveSymlinks: uiLStat.isSymbolicLink(),
     },
     optimizeDeps: {
       exclude: [
@@ -158,6 +161,13 @@ export default async function serve(options) {
       ],
       include: optimizationIncludes,
     },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: 'modern-compiler', // or "modern", "legacy"
+        },
+      },
+    },
     plugins: [vue(), createConfigJsonReloadPlugin()],
     server: {
       middlewareMode: true,

package/src/update.js

@@ -1,5 +1,5 @@
 import { logger } from '@vcsuite/cli-logger';
-import { validRange, prerelease } from 'semver';
+import { validRange, maxSatisfying, prerelease } from 'semver';
 import {
   checkVcMapVersion,
   DepType,
@@ -36,17 +36,31 @@ export async function updatePeerDependencies(
     );
     options.mapVersion = 'latest';
   }
-  let viewCmd = 'npm view @vcmap/ui --json';
+  let viewCmd =
+    'npm view @vcmap/ui --json peerDependencies devDependencies version name';
   if (options.mapVersion) {
-    viewCmd = `npm view @vcmap/ui@${options.mapVersion} --json`;
+    viewCmd = `npm view @vcmap/ui@${options.mapVersion} --json peerDependencies devDependencies version name`;
   }
   const { stdout, stderr } = await promiseExec(viewCmd);
   logger.error(stderr);
+  const npmVersions = JSON.parse(stdout);
+  let npmVersion = null;
+  if (Array.isArray(npmVersions)) {
+    const versions = npmVersions.map((v) => v.version);
+    const versionToUse = maxSatisfying(versions, options.mapVersion);
+    npmVersion = npmVersions.find((v) => v.version === versionToUse);
+  } else {
+    npmVersion = npmVersions;
+  }
+  if (!npmVersion) {
+    console.log(`could not find @vcmap/ui version for ${options.mapVersion}`);
+    return;
+  }
   const {
     name: mapName,
     peerDependencies: mapPeer,
     devDependencies: mapDev,
-  } = JSON.parse(stdout);
+  } = npmVersion;
   const peerDeps = [`${mapName}@${options.mapVersion || 'latest'}`]; // @vcmap/ui is a required peer dep and will be updated in any case
   if (pluginPeer) {
     const pluginPeerDeps = Object.keys(pluginPeer)