Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
fetch-tags: true
path: docs-dist
repository: nanoforge-dev/docs
token: ${{ secrets.ACTIONS_KEY }}
token: ${{ secrets.TOKEN }}

- name: Prepare
uses: ./.github/actions/prepare
Expand Down
13 changes: 7 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ catalogs:
monaco-editor: ^0.55.1
svelte-sonner: ^1.1.1
core:
'@nanoforge-dev/ecs-lib': ^1.3.1
'@nanoforge-dev/ecs-lib': 1.3.2-alpha.add-assets-handling.0
'@sveltejs/adapter-auto': ^7.0.1
'@sveltejs/kit': ^2.65.0
'@sveltejs/vite-plugin-svelte': ^7.1.2
Expand Down Expand Up @@ -79,3 +79,6 @@ catalogs:
playwright: ^1.60.0
vitest: ^4.1.8
vitest-browser-svelte: ^2.1.1

minimumReleaseAgeExclude:
- '@nanoforge-dev/ecs-lib@1.3.2-alpha.add-assets-handling.0'
2 changes: 1 addition & 1 deletion src/lib/client/ecs/asset/asset-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class AssetManager {

async create(file: File): Promise<void> {
const { fs } = useProject();
const assetDir = await fs.getDirectory('assets');
const assetDir = await fs.getDirectory('static');
const assetFile = await assetDir.getFile(file.name);
const stream = await assetFile.createWritable();
await file.stream().pipeTo(stream);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/client/ecs/component/component.type.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ComponentManifest } from '$lib/server/project/package';
import type { ComponentManifest } from '$lib/server/project/package/manifest/manifest.type';

export type ComponentParam = ComponentManifest['params'][number];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Readable, get } from 'svelte/store';

import type { Component } from '../../../asset/asset.type';
import type { Component } from '../../../component/component.type';
import type { EntityComponentManager } from './component-manager';
import { ComponentParamManager } from './component-param-manager';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Readable, type Unsubscriber, type Writable, get, writable } from 'svelte/store';

import type { ComponentParam } from '../../../asset/asset.type';
import type { ComponentParam } from '../../../component/component.type';
import { resetListeners, resolveStore } from '../../../utils';
import type { ComponentParamManager } from './component-param-manager';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Unsubscriber, type Writable, get, writable } from 'svelte/store';

import type { ComponentParam } from '../../../asset/asset.type';
import type { ComponentParam } from '../../../component/component.type';
import { resetListeners, resetSubscriptions } from '../../../utils';
import { resolveStore } from '../../../utils';
import type { EntityComponentHandle } from './component-handle';
Expand Down
5 changes: 4 additions & 1 deletion src/lib/client/project/save-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ export class SaveHandler {
components: components.map((component) => ({
name: component.id,
path: component.path,
paramsNames: component.params.map((p) => p.name),
paramsNames: component.params.map((p) => {
if (p.type === 'asset') return `__RESERVED_ASSET_${p.name}`;
return p.name;
}),
})),
});
void this.forceSyncToServer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
import { TristateSwitch } from '$lib/components/ui/tristate-switch';
import { Select, SelectContent, SelectItem, SelectTrigger } from '$lib/components/ui/select';
import { untrack } from 'svelte';
import { useProject } from '$lib/client/project';

interface Props {
handle: ComponentParamHandle;
}

const { handle }: Props = $props();

const { ecs } = useProject();

const param = $derived(handle.store);
const defaultValue = $derived(handle.value);
const assets = $derived(ecs.assets.store);

let value = $state<any>($defaultValue);

Expand Down Expand Up @@ -46,6 +50,7 @@
{/if}
{:else}
{#if Object.keys($param.enum).length === 0}
<SelectItem value="">None</SelectItem>
{#each Object.entries($param.enum) as [displayOpt, realOpt] (displayOpt)}
<SelectItem value={realOpt}>{displayOpt}</SelectItem>
{/each}
Expand All @@ -62,5 +67,19 @@
<Input type="number" bind:value onchange={handleChange} />
{:else if $param.type === 'boolean'}
<TristateSwitch bind:value onChange={handleChange} />
{:else if $param.type === 'asset'}
<Select type="single" bind:value onValueChange={handleChange}>
<SelectTrigger class="w-full overflow-y-hidden">{value}</SelectTrigger>
<SelectContent>
{#if $assets.length !== 0}
<SelectItem value="">None</SelectItem>
{#each $assets as asset (asset.id)}
<SelectItem value={asset.path}>{asset.id}</SelectItem>
{/each}
{:else}
<div class="px-4 py-2 text-muted-foreground italic">No options</div>
{/if}
</SelectContent>
</Select>
{/if}
</div>
5 changes: 4 additions & 1 deletion src/lib/server/project/package/package-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ export class PackageHandler {
}

async getAssets(): Promise<AssetPackage[]> {
return this._resolvesPackages(PackageTypeEnum.ASSET);
return this._resolvesPackages(PackageTypeEnum.ASSET).map((asset) => ({
...asset,
path: asset.path.replace(new RegExp(`^${PACKAGES_PATH.asset}/`), ''),
}));
}

private _resolvesPackages<T extends PackageTypeEnum>(type: T): PackageType<T>[] {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/project/package/package.const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PackageTypeEnum } from './package.enum';
export const PACKAGES_PATH: Record<PackageTypeEnum, string> = {
[PackageTypeEnum.COMPONENT]: 'components',
[PackageTypeEnum.SYSTEM]: 'systems',
[PackageTypeEnum.ASSET]: 'assets',
[PackageTypeEnum.ASSET]: 'static',
};

export const PACKAGES_NAME_FORMATTER: Record<PackageTypeEnum, (n: string) => string> = {
Expand Down
Loading