@jupytergis/base 0.14.1 → 0.16.0-alpha.0

package/lib/features/identify/utils/getFeatureIdentifier.js

@@ -0,0 +1,14 @@
+/**
+ * Resolve a stable feature identifier across common property names.
+ */
+export function getFeatureIdentifier(feature) {
+    var _a, _b, _c;
+    const rawIdentifier = (_c = (_b = (_a = feature._id) !== null && _a !== void 0 ? _a : feature.id) !== null && _b !== void 0 ? _b : feature.fid) !== null && _c !== void 0 ? _c : feature.featureId;
+    if (typeof rawIdentifier === 'string') {
+        return rawIdentifier;
+    }
+    if (typeof rawIdentifier === 'number') {
+        return String(rawIdentifier);
+    }
+    return undefined;
+}

package/lib/features/identify/utils/highlightLayer.d.ts

@@ -0,0 +1,11 @@
+import { Map as OlMap } from 'ol';
+import { VectorImage as VectorImageLayer } from 'ol/layer';
+import { Vector as VectorSource } from 'ol/source';
+/**
+ * Ensure the highlight layer exists and is attached to the map.
+ * Creates it on first call; re-adds it if the map removed it
+ * (e.g. during a layer sync that strips non-model layers).
+ */
+export declare function ensureHighlightLayer(map: OlMap, layerRef: {
+    current: VectorImageLayer<VectorSource> | null;
+}): VectorImageLayer<VectorSource>;

package/lib/features/identify/utils/highlightLayer.js

@@ -0,0 +1,57 @@
+import { VectorImage as VectorImageLayer } from 'ol/layer';
+import { Vector as VectorSource } from 'ol/source';
+import { Circle, Fill, Stroke, Style } from 'ol/style';
+/**
+ * Style function used by the highlight overlay layer.
+ * Returns a fixed highlight style based on geometry type.
+ */
+function highlightStyleFunction(feature) {
+    var _a;
+    const geomType = (_a = feature.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType();
+    switch (geomType) {
+        case 'Point':
+        case 'MultiPoint':
+            return new Style({
+                image: new Circle({
+                    radius: 8,
+                    fill: new Fill({ color: 'transparent' }),
+                    stroke: new Stroke({ color: '#ff0', width: 3 }),
+                }),
+            });
+        case 'LineString':
+        case 'MultiLineString':
+            return new Style({
+                stroke: new Stroke({ color: 'rgba(255, 255, 0, 0.8)', width: 3 }),
+            });
+        case 'Polygon':
+        case 'MultiPolygon':
+            return new Style({
+                stroke: new Stroke({ color: '#ff0', width: 2 }),
+                fill: new Fill({ color: 'rgba(255, 255, 0, 0.15)' }),
+            });
+        default:
+            return new Style({
+                stroke: new Stroke({ color: '#ff0', width: 2 }),
+            });
+    }
+}
+/**
+ * Ensure the highlight layer exists and is attached to the map.
+ * Creates it on first call; re-adds it if the map removed it
+ * (e.g. during a layer sync that strips non-model layers).
+ */
+export function ensureHighlightLayer(map, layerRef) {
+    if (layerRef.current &&
+        map.getLayers().getArray().includes(layerRef.current)) {
+        return layerRef.current;
+    }
+    if (!layerRef.current) {
+        layerRef.current = new VectorImageLayer({
+            source: new VectorSource(),
+            style: highlightStyleFunction,
+            zIndex: 999,
+        });
+    }
+    map.addLayer(layerRef.current);
+    return layerRef.current;
+}

package/lib/features/identify/utils/highlightStyle.d.ts

@@ -0,0 +1,7 @@
+import { Style } from 'ol/style';
+/**
+ * Build a highlight style from an original resolved style.
+ * Preserves data-driven properties (circle radius, line width) and swaps in
+ * a constant yellow highlight color.
+ */
+export declare function buildHighlightStyle(original: Style, geomType?: string): Style;

package/lib/features/identify/utils/highlightStyle.js

@@ -0,0 +1,40 @@
+import { Circle, Fill, Stroke, Style } from 'ol/style';
+import CircleStyle from 'ol/style/Circle';
+/**
+ * Build a highlight style from an original resolved style.
+ * Preserves data-driven properties (circle radius, line width) and swaps in
+ * a constant yellow highlight color.
+ */
+export function buildHighlightStyle(original, geomType) {
+    var _a;
+    // Only use the circle branch for point geometries.  The OL default style
+    // includes a circle image alongside fill/stroke; without this guard the
+    // circle branch would fire for polygons and produce an invisible style.
+    const isPoint = geomType === 'Point' || geomType === 'MultiPoint';
+    if (isPoint) {
+        const image = original.getImage();
+        if (image instanceof CircleStyle) {
+            return new Style({
+                image: new Circle({
+                    radius: image.getRadius() + 4,
+                    fill: new Fill({ color: 'transparent' }),
+                    stroke: new Stroke({ color: '#ff0', width: 3 }),
+                }),
+            });
+        }
+    }
+    const origStroke = original.getStroke();
+    const origFill = original.getFill();
+    if (origStroke || origFill) {
+        return new Style(Object.assign({ stroke: new Stroke({
+                color: 'rgba(255, 255, 0, 0.4)',
+                width: ((_a = origStroke === null || origStroke === void 0 ? void 0 : origStroke.getWidth()) !== null && _a !== void 0 ? _a : 1) + 4,
+            }) }, (origFill
+            ? { fill: new Fill({ color: 'rgba(255, 255, 0, 0.15)' }) }
+            : {})));
+    }
+    // Fallback
+    return new Style({
+        stroke: new Stroke({ color: 'rgba(255, 255, 0, 0.4)', width: 4 }),
+    });
+}

package/lib/{dialogs/layerBrowserDialog.js → features/layer-browser/index.js}

@@ -4,8 +4,8 @@ import { Dialog } from '@jupyterlab/apputils';
 import { PromiseDelegate, UUID } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import React, { useEffect, useState } from 'react';
-import { CreationFormWrapper } from './layerCreationFormDialog';
-import CUSTOM_RASTER_IMAGE from '../../layer_gallery/custom_raster.png';
+import { CreationFormWrapper } from "../layers/layerCreationFormDialog";
+import CUSTOM_RASTER_IMAGE from '../../../custom_raster.png';
 export const LayerBrowserComponent = ({ model, registry, formSchemaRegistry, okSignalPromise, cancel, registerConfirmHandler, }) => {
     const [searchTerm, setSearchTerm] = useState('');
     const [activeLayers, setActiveLayers] = useState([]);

package/lib/features/layers/forms/layer/geoTiffLayerForm.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import type { ILayerProps } from './layerform';
+export declare function GeoTiffLayerPropertiesForm(props: ILayerProps): React.ReactElement | null;

package/lib/{formbuilder/objectform/layer/webGlLayerForm.js → features/layers/forms/layer/geoTiffLayerForm.js}

@@ -1,9 +1,9 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
-export function WebGlLayerPropertiesForm(props) {
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
+export function GeoTiffLayerPropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({
         sourceData,

package/lib/{formbuilder/objectform → features/layers/forms}/layer/heatmapLayerForm.js

@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { deepCopy, loadFile } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy, loadFile } from "../../../../tools";
 async function fetchFeatureNames(model, layerData, sourceData) {
     var _a, _b, _c, _d;
     let resolvedSource = sourceData;

package/lib/{formbuilder/objectform → features/layers/forms}/layer/hillshadeLayerForm.js

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
 export function HillshadeLayerPropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/{formbuilder/objectform → features/layers/forms}/layer/index.d.ts

@@ -2,5 +2,5 @@ export * from './heatmapLayerForm';
 export * from './hillshadeLayerForm';
 export * from './layerform';
 export * from './vectorlayerform';
-export * from './webGlLayerForm';
+export * from './geoTiffLayerForm';
 export * from './storySegmentLayerForm';

package/lib/{formbuilder/objectform → features/layers/forms}/layer/index.js

@@ -2,5 +2,5 @@ export * from './heatmapLayerForm';
 export * from './hillshadeLayerForm';
 export * from './layerform';
 export * from './vectorlayerform';
-export * from './webGlLayerForm';
+export * from './geoTiffLayerForm';
 export * from './storySegmentLayerForm';

package/lib/{formbuilder/objectform → features/layers/forms}/layer/layerform.d.ts

@@ -5,7 +5,7 @@
 import { IDict, SourceType } from '@jupytergis/schema';
 import { Signal } from '@lumino/signaling';
 import React from 'react';
-import type { IBaseFormProps } from "../../../types";
+import type { IBaseFormProps } from "../../../../types";
 export interface ILayerProps extends IBaseFormProps {
     /**
      * The source type for the layer

package/lib/{formbuilder/objectform → features/layers/forms}/layer/layerform.js

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
 export function LayerPropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/features/layers/forms/layer/storySegmentLayerForm.js

@@ -0,0 +1,150 @@
+import React, { useCallback, useMemo } from 'react';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { ArrayFieldTemplate } from "../../../../shared/formbuilder/objectform/components/SegmentFormSymbology";
+import { SourcePropertiesField } from "../../../../shared/formbuilder/objectform/components/SourcePropertiesField";
+import StorySegmentReset from "../../../../shared/formbuilder/objectform/components/StorySegmentReset";
+import { processBaseSchema, removeFormEntry, removeNestedFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
+function normalizeSegmentContent(content) {
+    var _a, _b, _c, _d;
+    const value = content !== null && content !== void 0 ? content : {};
+    if (value.contentMode === 'markdown') {
+        return {
+            contentMode: 'markdown',
+            markdown: (_a = value.markdown) !== null && _a !== void 0 ? _a : '',
+        };
+    }
+    return {
+        contentMode: 'map',
+        title: (_b = value.title) !== null && _b !== void 0 ? _b : '',
+        image: (_c = value.image) !== null && _c !== void 0 ? _c : '',
+        markdown: (_d = value.markdown) !== null && _d !== void 0 ? _d : '',
+    };
+}
+function normalizeStorySegmentFormData(data) {
+    const normalizedData = deepCopy(data);
+    normalizedData.content = normalizeSegmentContent(normalizedData.content);
+    return normalizedData;
+}
+function getFirstSelectedStorySegmentLayerId(model) {
+    const selected = model.selected;
+    if (!selected) {
+        return undefined;
+    }
+    for (const key of Object.keys(selected)) {
+        const layer = model.getLayer(key);
+        if ((layer === null || layer === void 0 ? void 0 : layer.type) === 'StorySegmentLayer') {
+            return key;
+        }
+    }
+    return undefined;
+}
+const StorySegmentResetField = (props) => {
+    const ctx = props.formContext;
+    return React.createElement(StorySegmentReset, { model: ctx === null || ctx === void 0 ? void 0 : ctx.model, layerId: ctx === null || ctx === void 0 ? void 0 : ctx.layerId });
+};
+export function StorySegmentLayerPropertiesForm(props) {
+    const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, formSchemaRegistry, } = props;
+    const { formData, schema, formContextValue: baseFormContext, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({
+        sourceData: sourceData
+            ? normalizeStorySegmentFormData(sourceData)
+            : undefined,
+        schemaProp,
+        model,
+        syncData,
+        cancel: props.cancel,
+        onAfterChange: dialogOptions
+            ? (data) => {
+                dialogOptions.layerData = Object.assign({}, normalizeStorySegmentFormData(data));
+            }
+            : undefined,
+    });
+    const handleChange = useCallback((data) => {
+        handleChangeBase(normalizeStorySegmentFormData(data));
+    }, [handleChangeBase]);
+    const handleSubmit = useCallback((data) => {
+        handleSubmitBase(normalizeStorySegmentFormData(data));
+    }, [handleSubmitBase]);
+    const displayFormData = useMemo(() => normalizeStorySegmentFormData(formData), [formData]);
+    const contentMode = displayFormData.content.contentMode === 'markdown' ? 'markdown' : 'map';
+    const layerId = useMemo(() => getFirstSelectedStorySegmentLayerId(model), [model, model.selected]);
+    const formContextValue = useMemo(() => (Object.assign(Object.assign({}, baseFormContext), { layerId, formSchemaRegistry })), [baseFormContext, layerId]);
+    const { displaySchema, uiSchema } = useMemo(() => {
+        var _a, _b;
+        const displaySchema = deepCopy(schema);
+        const builtUiSchema = {};
+        const dataCopy = deepCopy(displayFormData);
+        processBaseSchema(dataCopy, displaySchema, builtUiSchema, formContext, removeFormEntry);
+        if ((_a = displaySchema.properties) === null || _a === void 0 ? void 0 : _a.source) {
+            const availableSources = model.getSourcesByType(sourceType);
+            displaySchema.properties.source.enumNames =
+                Object.values(availableSources);
+            displaySchema.properties.source.enum =
+                Object.keys(availableSources);
+        }
+        removeFormEntry('zoom', dataCopy, displaySchema, builtUiSchema);
+        const layerOverrideItems = (_b = displaySchema.properties) === null || _b === void 0 ? void 0 : _b.layerOverride;
+        const itemsProps = layerOverrideItems === null || layerOverrideItems === void 0 ? void 0 : layerOverrideItems.items;
+        const itemsProperties = itemsProps === null || itemsProps === void 0 ? void 0 : itemsProps.properties;
+        if (itemsProperties) {
+            delete itemsProperties.color;
+            delete itemsProperties.symbologyState;
+        }
+        const contentFieldUi = Object.assign(Object.assign({}, builtUiSchema.content), { contentMode: {
+                'ui:widget': 'select',
+            }, markdown: {
+                'ui:widget': 'textarea',
+                'ui:options': {
+                    rows: 10,
+                },
+            } });
+        if (contentMode === 'markdown') {
+            removeNestedFormEntry('content', 'title', dataCopy, displaySchema, builtUiSchema);
+            removeNestedFormEntry('content', 'image', dataCopy, displaySchema, builtUiSchema);
+            removeFormEntry('transition', dataCopy, displaySchema, builtUiSchema);
+            removeFormEntry('layerOverride', dataCopy, displaySchema, builtUiSchema);
+            removeFormEntry('extent', dataCopy, displaySchema, builtUiSchema);
+            builtUiSchema.content = Object.assign(Object.assign({}, contentFieldUi), { 'ui:order': ['contentMode', 'markdown'] });
+        }
+        else {
+            // contentMode === 'map'
+            builtUiSchema.content = Object.assign(Object.assign({}, contentFieldUi), { 'ui:order': ['contentMode', 'title', 'image', 'markdown'] });
+            if (model.selected) {
+                builtUiSchema.extent = {
+                    'ui:field': 'storySegmentReset',
+                };
+            }
+            builtUiSchema.layerOverride = Object.assign(Object.assign({}, builtUiSchema.layerOverride), { items: {
+                    'ui:title': '',
+                    targetLayer: {
+                        'ui:field': 'layerSelect',
+                    },
+                    opacity: {
+                        'ui:field': 'opacity',
+                    },
+                    sourceProperties: {
+                        'ui:field': SourcePropertiesField,
+                    },
+                }, 'ui:options': {
+                    orderable: false,
+                }, 'ui:ArrayFieldTemplate': ArrayFieldTemplate });
+        }
+        return { displaySchema, uiSchema: builtUiSchema };
+    }, [
+        schema,
+        displayFormData,
+        formContext,
+        model,
+        sourceType,
+        contentMode,
+        model.selected,
+    ]);
+    const additionalFields = useMemo(() => ({
+        storySegmentReset: StorySegmentResetField,
+    }), []);
+    if (!hasSchema) {
+        return null;
+    }
+    return (React.createElement(SchemaForm, { schema: displaySchema, formData: displayFormData, onChange: handleChange, onSubmit: handleSubmit, formContext: formContextValue, filePath: filePath, uiSchema: uiSchema, additionalFields: additionalFields, formErrorSignal: formErrorSignal }));
+}

package/lib/{formbuilder/objectform → features/layers/forms}/layer/vectorlayerform.js

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
 export function VectorLayerPropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/{formbuilder/objectform → features/layers/forms}/source/geojsonsource.js

@@ -2,11 +2,11 @@ import * as geojson from '@jupytergis/schema/src/schema/geojson.json';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { Ajv } from 'ajv';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { deepCopy, loadFile } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { FileSelectorWidget } from '../fileselectorwidget';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { FileSelectorWidget } from "../../../../shared/formbuilder/objectform/fileselectorwidget";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy, loadFile } from "../../../../tools";
 export function GeoJSONSourcePropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, dialogOptions, formErrorSignal, formSchemaRegistry, cancel, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/features/layers/forms/source/geopackagesource.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import type { ISourceFormProps } from './sourceform';
+export declare function GeoPackagePropertiesForm(props: ISourceFormProps): React.ReactElement | null;

package/lib/features/layers/forms/source/geopackagesource.js

@@ -0,0 +1,93 @@
+import { showErrorMessage } from '@jupyterlab/apputils';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { FileSelectorWidget } from "../../../../shared/formbuilder/objectform/fileselectorwidget";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
+export function GeoPackagePropertiesForm(props) {
+    const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, formSchemaRegistry, cancel, } = props;
+    const { formData, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({
+        sourceData,
+        schemaProp,
+        model,
+        syncData,
+        cancel,
+        onAfterChange: dialogOptions
+            ? (data) => {
+                dialogOptions.sourceData = Object.assign({}, data);
+            }
+            : undefined,
+    });
+    const [extraErrors, setExtraErrors] = useState({});
+    const validatePath = useCallback((path) => {
+        const nextErrors = {};
+        let valid = true;
+        let error = '';
+        if (!path) {
+            valid = false;
+            error = 'Path is required';
+        }
+        else {
+            const isUrl = path.startsWith('http://') || path.startsWith('https://');
+            if (!isUrl && !path.toLowerCase().endsWith('.gpkg')) {
+                valid = false;
+                error = `"${path}" does not appear to be a GeoPackage file (.gpkg).`;
+            }
+        }
+        if (!valid) {
+            nextErrors.path = { __errors: [error] };
+        }
+        else {
+            nextErrors.path = { __errors: [] };
+        }
+        setExtraErrors(nextErrors);
+        formErrorSignal === null || formErrorSignal === void 0 ? void 0 : formErrorSignal.emit(!valid);
+    }, [formErrorSignal]);
+    const schema = useMemo(() => {
+        const schemaCopy = deepCopy(schemaProp !== null && schemaProp !== void 0 ? schemaProp : {});
+        if (schemaCopy.properties) {
+            delete schemaCopy.properties.valid;
+        }
+        return schemaCopy;
+    }, [schemaProp]);
+    const uiSchema = useMemo(() => {
+        var _a;
+        const builtUiSchema = {};
+        const dataCopy = deepCopy(formData);
+        processBaseSchema(dataCopy, schema, builtUiSchema, formContext, removeFormEntry);
+        const docManager = formSchemaRegistry === null || formSchemaRegistry === void 0 ? void 0 : formSchemaRegistry.getDocManager();
+        if (((_a = schema.properties) === null || _a === void 0 ? void 0 : _a.path) && docManager) {
+            builtUiSchema.path = {
+                'ui:widget': FileSelectorWidget,
+                'ui:options': {
+                    docManager,
+                    formOptions: Object.assign(Object.assign({}, props), { sourceType }),
+                },
+            };
+        }
+        return builtUiSchema;
+    }, [schema, formData, formContext, formSchemaRegistry, props, sourceType]);
+    const handleChange = useCallback((data) => {
+        handleChangeBase(data);
+        if (data.path !== undefined) {
+            validatePath(data.path);
+        }
+    }, [handleChangeBase, validatePath]);
+    const handleSubmit = useCallback((data) => {
+        var _a, _b;
+        if (((_b = (_a = extraErrors === null || extraErrors === void 0 ? void 0 : extraErrors.path) === null || _a === void 0 ? void 0 : _a.__errors) === null || _b === void 0 ? void 0 : _b.length) >= 1) {
+            showErrorMessage('Invalid file', extraErrors.path.__errors[0]);
+            return;
+        }
+        handleSubmitBase(data);
+    }, [extraErrors, handleSubmitBase]);
+    useEffect(() => {
+        var _a;
+        validatePath((_a = formData === null || formData === void 0 ? void 0 : formData.path) !== null && _a !== void 0 ? _a : '');
+    }, []);
+    if (!hasSchema) {
+        return null;
+    }
+    return (React.createElement(SchemaForm, { schema: schema, formData: formData, onChange: handleChange, onSubmit: handleSubmit, formContext: formContextValue, filePath: filePath, uiSchema: uiSchema, extraErrors: extraErrors, formErrorSignal: formErrorSignal }));
+}

package/lib/{formbuilder/objectform → features/layers/forms}/source/geotiffsource.js

@@ -1,10 +1,10 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { deepCopy, getMimeType } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { FileSelectorWidget } from '../fileselectorwidget';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { FileSelectorWidget } from "../../../../shared/formbuilder/objectform/fileselectorwidget";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy, getMimeType } from "../../../../tools";
 export function GeoTiffSourcePropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, formSchemaRegistry, cancel, } = props;
     const { formData, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/{formbuilder/objectform → features/layers/forms}/source/index.d.ts

@@ -1,5 +1,7 @@
 export * from './geojsonsource';
+export * from './geopackagesource';
 export * from './geotiffsource';
 export * from './pathbasedsource';
 export * from './sourceform';
 export * from './tilesourceform';
+export * from './wmsTileSource';

package/lib/{formbuilder/objectform → features/layers/forms}/source/index.js

@@ -1,5 +1,7 @@
 export * from './geojsonsource';
+export * from './geopackagesource';
 export * from './geotiffsource';
 export * from './pathbasedsource';
 export * from './sourceform';
 export * from './tilesourceform';
+export * from './wmsTileSource';

package/lib/{formbuilder/objectform → features/layers/forms}/source/pathbasedsource.js

@@ -1,10 +1,10 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { deepCopy, loadFile } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { FileSelectorWidget } from '../fileselectorwidget';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { FileSelectorWidget } from "../../../../shared/formbuilder/objectform/fileselectorwidget";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy, loadFile } from "../../../../tools";
 export function PathBasedSourcePropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, sourceType, dialogOptions, formErrorSignal, formSchemaRegistry, cancel, } = props;
     const { formData, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/{formbuilder/objectform → features/layers/forms}/source/sourceform.d.ts

@@ -5,7 +5,7 @@
 import { IDict, SourceType } from '@jupytergis/schema';
 import { Signal } from '@lumino/signaling';
 import React from 'react';
-import type { IBaseFormProps } from "../../../types";
+import type { IBaseFormProps } from "../../../../types";
 export interface ISourceFormProps extends IBaseFormProps {
     /**
      * The source type for this form.

package/lib/{formbuilder/objectform → features/layers/forms}/source/sourceform.js

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
 export function SourcePropertiesForm(props) {
     const { schema: schemaProp, sourceData, syncData, model, filePath, formContext, dialogOptions, cancel, formErrorSignal, } = props;
     const { formData, schema, formContextValue, hasSchema, handleChangeBase, handleSubmitBase, } = useSchemaFormState({

package/lib/{formbuilder/objectform → features/layers/forms}/source/tilesourceform.js

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../../tools";
-import { SchemaForm } from '../SchemaForm';
-import { processBaseSchema, removeFormEntry } from '../schemaUtils';
-import { useSchemaFormState } from '../useSchemaFormState';
+import { SchemaForm } from "../../../../shared/formbuilder/objectform/SchemaForm";
+import { processBaseSchema, removeFormEntry, } from "../../../../shared/formbuilder/objectform/schemaUtils";
+import { useSchemaFormState } from "../../../../shared/formbuilder/objectform/useSchemaFormState";
+import { deepCopy } from "../../../../tools";
 function getUrlParameters(url) {
     if (!url || typeof url !== 'string') {
         return [];

package/lib/features/layers/forms/source/wmsTileSource.d.ts

@@ -0,0 +1,4 @@
+import { ReactElement } from 'react';
+import type { ISourceFormProps } from './sourceform';
+export declare const WMS_AVAILABLE_LAYERS_CACHE = "jgis:wmsTileSource:availableLayers";
+export declare function WmsTileSourceForm(props: ISourceFormProps): ReactElement | null;