@grafana/create-plugin 6.2.0-canary.2233.19097561440.0 → 6.2.0-canary.2233.19368311379.0

package/dist/utils/utils.checks.js

@@ -0,0 +1,40 @@
+import { isGitDirectory, isGitDirectoryClean } from './utils.git.js';
+import { isPluginDirectory } from './utils.plugin.js';
+import { output } from './utils.console.js';
+
+async function performPreCodemodChecks(argv) {
+  if (!await isGitDirectory() && !argv.force) {
+    output.error({
+      title: "You are not inside a git directory",
+      body: [
+        `In order to proceed please run ${output.formatCode("git init")} in the root of your project and commit your changes.`,
+        `(This check is necessary to make sure that changes are easy to revert and don't interfere with any changes you currently have.`,
+        `In case you want to proceed as is please use the ${output.formatCode("--force")} flag.)`
+      ]
+    });
+    process.exit(1);
+  }
+  if (!await isGitDirectoryClean() && !argv.force) {
+    output.error({
+      title: "Please clean your repository working tree before making changes.",
+      body: [
+        "Commit your changes or stash them.",
+        `(This check is necessary to make sure that changes are easy to revert and don't mess with any changes you currently have.`,
+        `In case you want to proceed as is please use the ${output.formatCode("--force")} flag.)`
+      ]
+    });
+    process.exit(1);
+  }
+  if (!isPluginDirectory() && !argv.force) {
+    output.error({
+      title: "Are you inside a plugin directory?",
+      body: [
+        `We couldn't find a "src/plugin.json" file under your current directory.`,
+        `(Please make sure to run this command from the root of your plugin folder. In case you want to proceed as is please use the ${output.formatCode("--force")} flag.)`
+      ]
+    });
+    process.exit(1);
+  }
+}
+
+export { performPreCodemodChecks };

package/dist/utils/utils.config.js

@@ -8,9 +8,6 @@ import path from 'node:path';
 import { writeFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 
-function isFeatureEnabled(features, featureName) {
-  return features[featureName] === true;
-}
 let hasShownConfigWarnings = false;
 function getConfig(workDir = process.cwd()) {
   const rootConfig = getRootConfig(workDir);
@@ -95,17 +92,5 @@ async function setRootConfig(configOverride = {}) {
   await writeFile(rootConfigPath, JSON.stringify(updatedConfig, null, 2) + EOL);
   return updatedConfig;
 }
-async function setFeatureFlag(featureName, enabled = true) {
-  const userConfig = getUserConfig() || { features: {} };
-  const userConfigPath = path.resolve(process.cwd(), ".cprc.json");
-  const updatedConfig = {
-    ...userConfig,
-    features: {
-      ...userConfig.features,
-      [featureName]: enabled
-    }
-  };
-  await writeFile(userConfigPath, JSON.stringify(updatedConfig, null, 2) + EOL);
-}
 
-export { getConfig, isFeatureEnabled, setFeatureFlag, setRootConfig };
+export { getConfig, setRootConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.2.0-canary.2233.19097561440.0",
+  "version": "6.2.0-canary.2233.19368311379.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -38,6 +38,7 @@
     "recast": "^0.23.11",
     "semver": "^7.3.5",
     "title-case": "^4.3.0",
+    "valibot": "^1.1.0",
     "which": "^5.0.0",
     "yaml": "^2.7.0"
   },
@@ -59,5 +60,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "51cedf8d3738d2ca2401063cd1cae3f06140ce63"
+  "gitHead": "265f74e1e4a843bdeaad5300a13b94391ffd5fff"
 }

package/src/codemods/additions/additions.test.ts

@@ -0,0 +1,12 @@
+import defaultAdditions from './additions.js';
+
+describe('additions json', () => {
+  // as addition scripts are imported dynamically when add is run we assert the path is valid
+  defaultAdditions.forEach((addition) => {
+    it(`should have a valid addition script path for ${addition.name}`, () => {
+      expect(async () => {
+        await import(addition.scriptPath);
+      }).not.toThrow();
+    });
+  });
+});

package/src/codemods/additions/additions.ts

@@ -1,23 +1,10 @@
-export type AdditionMeta<TFeatureName extends string = string> = {
-  name: string;
-  description: string;
-  scriptPath: string;
-  featureName: TFeatureName;
-};
-
-const additions = {
-  i18n: {
-    name: 'i18n',
-    description: 'Add internationalization (i18n) support to your plugin',
-    scriptPath: './scripts/add-i18n.js',
-    featureName: 'i18nEnabled',
+import { Codemod } from '../types.js';
+import { resolveScriptPath } from '../utils.js';
+
+export default [
+  {
+    name: 'example-addition',
+    description: 'Example addition demonstrating Valibot schema with type inference',
+    scriptPath: resolveScriptPath(import.meta.url, './scripts/example-addition.js'),
   },
-};
-
-export default { additions };
-
-// extract feature names for type-safe FeatureFlags in utils.config.ts
-type AdditionValues = (typeof additions)[keyof typeof additions];
-export type AdditionFeatureName = AdditionValues['featureName'];
-
-export type TypedAdditionMeta = AdditionMeta<AdditionFeatureName>;
+] satisfies Codemod[];

package/src/codemods/additions/scripts/example-addition.test.ts

@@ -0,0 +1,92 @@
+import { describe, expect, it } from 'vitest';
+
+import { Context } from '../../context.js';
+import migrate from './example-addition.js';
+
+describe('example-addition', () => {
+  it('should add example script to package.json', () => {
+    const context = new Context('/virtual');
+
+    context.addFile('package.json', JSON.stringify({ scripts: {}, dependencies: {}, devDependencies: {} }));
+
+    const result = migrate(context, { featureName: 'testFeature', enabled: true, frameworks: ['react'] });
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.scripts['example-script']).toBe('echo "Running testFeature"');
+  });
+
+  it('should add dev dependency', () => {
+    const context = new Context('/virtual');
+
+    context.addFile('package.json', JSON.stringify({ scripts: {}, dependencies: {}, devDependencies: {} }));
+
+    const result = migrate(context, { featureName: 'myFeature', enabled: false, frameworks: ['react'] });
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.devDependencies['example-dev-dep']).toBe('^1.0.0');
+  });
+
+  it('should create feature TypeScript file with options', () => {
+    const context = new Context('/virtual');
+
+    context.addFile('package.json', JSON.stringify({ scripts: {}, dependencies: {}, devDependencies: {} }));
+
+    const result = migrate(context, {
+      featureName: 'myFeature',
+      enabled: false,
+      port: 4000,
+      frameworks: ['react', 'vue'],
+    });
+
+    expect(result.doesFileExist('src/features/myFeature.ts')).toBe(true);
+    const featureCode = result.getFile('src/features/myFeature.ts');
+    expect(featureCode).toContain('export const myFeature');
+    expect(featureCode).toContain('enabled: false');
+    expect(featureCode).toContain('port: 4000');
+    expect(featureCode).toContain('frameworks: ["react","vue"]');
+    expect(featureCode).toContain('myFeature initialized on port 4000');
+  });
+
+  it('should delete deprecated file if it exists', () => {
+    const context = new Context('/virtual');
+
+    context.addFile('package.json', JSON.stringify({ scripts: {}, dependencies: {}, devDependencies: {} }));
+    context.addFile('src/deprecated.ts', 'export const old = true;');
+
+    const result = migrate(context, { featureName: 'testFeature', enabled: true, frameworks: ['react'] });
+
+    expect(result.doesFileExist('src/deprecated.ts')).toBe(false);
+  });
+
+  it('should rename old-config.json if it exists', () => {
+    const context = new Context('/virtual');
+
+    context.addFile('package.json', JSON.stringify({ scripts: {}, dependencies: {}, devDependencies: {} }));
+    context.addFile('src/old-config.json', JSON.stringify({ old: true }));
+
+    const result = migrate(context, { featureName: 'testFeature', enabled: true, frameworks: ['react'] });
+
+    expect(result.doesFileExist('src/old-config.json')).toBe(false);
+    expect(result.doesFileExist('src/new-config.json')).toBe(true);
+    const newConfig = JSON.parse(result.getFile('src/new-config.json') || '{}');
+    expect(newConfig.old).toBe(true);
+  });
+
+  it('should not add script if it already exists', () => {
+    const context = new Context('/virtual');
+
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        scripts: { 'example-script': 'existing command' },
+        dependencies: {},
+        devDependencies: {},
+      })
+    );
+
+    const result = migrate(context, { featureName: 'testFeature', enabled: true, frameworks: ['react'] });
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.scripts['example-script']).toBe('existing command');
+  });
+});

package/src/codemods/additions/scripts/example-addition.ts

@@ -0,0 +1,62 @@
+import * as v from 'valibot';
+import type { Context } from '../../context.js';
+import { addDependenciesToPackageJson } from '../../utils.js';
+
+/**
+ * Example addition demonstrating Valibot schema with type inference
+ * Schema defines validation rules, defaults and types are automatically inferred
+ */
+export const schema = v.object({
+  featureName: v.pipe(
+    v.string(),
+    v.minLength(3, 'Feature name must be at least 3 characters'),
+    v.maxLength(50, 'Feature name must be at most 50 characters')
+  ),
+  enabled: v.optional(v.boolean(), true),
+  port: v.optional(
+    v.pipe(v.number(), v.minValue(1000, 'Port must be at least 1000'), v.maxValue(65535, 'Port must be at most 65535'))
+  ),
+  frameworks: v.optional(v.array(v.string()), ['react']),
+});
+
+// Type is automatically inferred from the schema
+type ExampleOptions = v.InferOutput<typeof schema>;
+
+export default function exampleAddition(context: Context, options: ExampleOptions): Context {
+  // These options have been validated by the framework
+  const { featureName, enabled, port, frameworks } = options;
+
+  const rawPkgJson = context.getFile('./package.json') ?? '{}';
+  const packageJson = JSON.parse(rawPkgJson);
+
+  if (packageJson.scripts && !packageJson.scripts['example-script']) {
+    packageJson.scripts['example-script'] = `echo "Running ${featureName}"`;
+    context.updateFile('./package.json', JSON.stringify(packageJson, null, 2));
+  }
+
+  addDependenciesToPackageJson(context, {}, { 'example-dev-dep': '^1.0.0' });
+
+  if (!context.doesFileExist(`./src/features/${featureName}.ts`)) {
+    const featureCode = `export const ${featureName} = {
+  name: '${featureName}',
+  enabled: ${enabled},
+  port: ${port ?? 3000},
+  frameworks: ${JSON.stringify(frameworks)},
+  init() {
+    console.log('${featureName} initialized on port ${port ?? 3000}');
+  },
+};
+`;
+    context.addFile(`./src/features/${featureName}.ts`, featureCode);
+  }
+
+  if (context.doesFileExist('./src/deprecated.ts')) {
+    context.deleteFile('./src/deprecated.ts');
+  }
+
+  if (context.doesFileExist('./src/old-config.json')) {
+    context.renameFile('./src/old-config.json', './src/new-config.json');
+  }
+
+  return context;
+}

package/src/codemods/migrations/fixtures/migrations.ts

@@ -1,19 +1,20 @@
-export default {
-  migrations: {
-    'migration-key1': {
-      version: '5.0.0',
-      description: 'Update project to use new cache directory',
-      migrationScript: './5-0-0-cache-directory.js',
-    },
-    'migration-key2': {
-      version: '5.4.0',
-      description: 'Update project to use new cache directory',
-      migrationScript: './5-4-0-cache-directory.js',
-    },
-    'migration-key3': {
-      version: '6.0.0',
-      description: 'Update project to use new cache directory',
-      migrationScript: './5-4-0-cache-directory.js',
-    },
+export default [
+  {
+    name: 'migration-key1',
+    version: '5.0.0',
+    description: 'Update project to use new cache directory',
+    scriptPath: './5-0-0-cache-directory.js',
   },
-};
+  {
+    name: 'migration-key2',
+    version: '5.4.0',
+    description: 'Update project to use new cache directory',
+    scriptPath: './5-4-0-cache-directory.js',
+  },
+  {
+    name: 'migration-key3',
+    version: '6.0.0',
+    description: 'Update project to use new cache directory',
+    scriptPath: './5-4-0-cache-directory.js',
+  },
+];

package/src/codemods/migrations/manager.test.ts

@@ -1,24 +1,23 @@
-import { flushChanges, formatFiles } from '../utils.js';
-import { getMigrationsToRun, runMigration, runMigrations } from './manager.js';
+import { flushChanges, formatFiles, printChanges } from '../utils.js';
+import { getMigrationsToRun, runMigrations } from './manager.js';
 
 import { Context } from '../context.js';
-import { MigrationMeta } from './migrations.js';
+import { Migration } from './migrations.js';
 import { gitCommitNoVerify } from '../../utils/utils.git.js';
 import migrationFixtures from './fixtures/migrations.js';
-import { printChanges } from './utils.js';
 import { setRootConfig } from '../../utils/utils.config.js';
 import { vi } from 'vitest';
 
-vi.mock('./utils.js', () => ({
-  printChanges: vi.fn(),
-  migrationsDebug: vi.fn(),
-}));
-
-vi.mock('../utils.js', () => ({
-  flushChanges: vi.fn(),
-  formatFiles: vi.fn(),
-  installNPMDependencies: vi.fn(),
-}));
+vi.mock('../utils.js', async (importOriginal) => {
+  const actual = (await importOriginal()) as any;
+  return {
+    ...actual,
+    flushChanges: vi.fn(),
+    formatFiles: vi.fn(),
+    installNPMDependencies: vi.fn(),
+    printChanges: vi.fn(),
+  };
+});
 
 // Silence terminal output during tests.
 vi.mock('../../utils/utils.console.js', () => ({
@@ -50,92 +49,83 @@ describe('Migrations', () => {
     it('should return the migrations that need to be run', () => {
       const fromVersion = '3.0.0';
       const toVersion = '5.0.0';
-      const migrations = getMigrationsToRun(fromVersion, toVersion, migrationFixtures.migrations);
-      expect(migrations).toEqual({
-        'migration-key1': {
+      const migrations = getMigrationsToRun(fromVersion, toVersion, migrationFixtures);
+      expect(migrations).toEqual([
+        {
+          name: 'migration-key1',
           version: '5.0.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './5-0-0-cache-directory.js',
+          scriptPath: './5-0-0-cache-directory.js',
         },
-      });
+      ]);
 
       const fromVersion2 = '5.0.0';
       const toVersion2 = '5.5.0';
-      const migrations2 = getMigrationsToRun(fromVersion2, toVersion2, migrationFixtures.migrations);
-      expect(migrations2).toEqual({
-        'migration-key1': {
+      const migrations2 = getMigrationsToRun(fromVersion2, toVersion2, migrationFixtures);
+      expect(migrations2).toEqual([
+        {
+          name: 'migration-key1',
           version: '5.0.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './5-0-0-cache-directory.js',
+          scriptPath: './5-0-0-cache-directory.js',
         },
-        'migration-key2': {
+        {
+          name: 'migration-key2',
           version: '5.4.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './5-4-0-cache-directory.js',
+          scriptPath: './5-4-0-cache-directory.js',
         },
-      });
+      ]);
 
       const fromVersion3 = '5.5.0';
       const toVersion3 = '6.0.0';
-      const migrations3 = getMigrationsToRun(fromVersion3, toVersion3, migrationFixtures.migrations);
-      expect(migrations3).toEqual({
-        'migration-key3': {
+      const migrations3 = getMigrationsToRun(fromVersion3, toVersion3, migrationFixtures);
+      expect(migrations3).toEqual([
+        {
+          name: 'migration-key3',
           version: '6.0.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './5-4-0-cache-directory.js',
+          scriptPath: './5-4-0-cache-directory.js',
         },
-      });
+      ]);
     });
 
     it('should sort migrations by version', () => {
       const fromVersion = '2.0.0';
       const toVersion = '6.0.0';
-      const migrations = getMigrationsToRun(fromVersion, toVersion, {
-        'migration-key1': {
+      const migrations = getMigrationsToRun(fromVersion, toVersion, [
+        {
+          name: 'migration-key1',
           version: '5.3.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './5.3.0-migration.js',
+          scriptPath: './5.3.0-migration.js',
         },
-        'migration-key2': {
+        {
+          name: 'migration-key2',
           version: '2.3.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './2.3.0-migration.js',
+          scriptPath: './2.3.0-migration.js',
         },
-        'migration-key3': {
+        {
+          name: 'migration-key3',
           version: '2.0.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './2.0.0-migration.js',
+          scriptPath: './2.0.0-migration.js',
         },
-        'migration-key4': {
+        {
+          name: 'migration-key4',
           version: '2.0.0',
           description: 'Update project to use new cache directory',
-          migrationScript: './2.0.0-migration.js',
+          scriptPath: './2.0.0-migration.js',
         },
-      });
-
-      expect(Object.keys(migrations)).toEqual(['migration-key3', 'migration-key4', 'migration-key2', 'migration-key1']);
-    });
-  });
-
-  describe('runMigration', () => {
-    it('should pass a context to the migration script', async () => {
-      const mockContext = new Context('/virtual');
-      const migrationFn = vi.fn().mockResolvedValue(mockContext);
-
-      vi.doMock('./test-migration.js', () => ({
-        default: migrationFn,
-      }));
-
-      const migration: MigrationMeta = {
-        version: '1.0.0',
-        description: 'test migration',
-        migrationScript: './test-migration.js',
-      };
-
-      const result = await runMigration(migration, mockContext);
-
-      expect(migrationFn).toHaveBeenCalledWith(mockContext);
-      expect(result).toBe(mockContext);
+      ]);
+
+      expect(migrations.map((m) => m.name)).toEqual([
+        'migration-key3',
+        'migration-key4',
+        'migration-key2',
+        'migration-key1',
+      ]);
     });
   });
 
@@ -144,25 +134,27 @@ describe('Migrations', () => {
     const migrationTwoFn = vi.fn();
     const consoleMock = vi.spyOn(console, 'log').mockImplementation(() => undefined);
 
-    vi.doMock('./migration-one.js', () => ({
+    vi.doMock('virtual-test-migration.js', async () => ({
       default: migrationOneFn,
     }));
-    vi.doMock('./migration-two.js', () => ({
+    vi.doMock('virtual-test-migration2.js', async () => ({
       default: migrationTwoFn,
     }));
 
-    const migrations: Record<string, MigrationMeta> = {
-      'migration-one': {
+    const migrations: Migration[] = [
+      {
+        name: 'migration-one',
         version: '1.0.0',
         description: '...',
-        migrationScript: './migration-one.js',
+        scriptPath: 'virtual-test-migration.js',
       },
-      'migration-two': {
+      {
+        name: 'migration-two',
         version: '1.2.0',
         description: '...',
-        migrationScript: './migration-two.js',
+        scriptPath: 'virtual-test-migration2.js',
       },
-    };
+    ];
 
     beforeEach(() => {
       migrationOneFn.mockImplementation(async (context: Context) => {
@@ -208,6 +200,7 @@ describe('Migrations', () => {
     it('should commit the changes for each migration if the CLI arg is present', async () => {
       await runMigrations(migrations, { commitEachMigration: true });
 
+      // 2 migration commits + 1 version update commit = 3 total
       expect(gitCommitNoVerify).toHaveBeenCalledTimes(3);
     });
 
@@ -216,6 +209,7 @@ describe('Migrations', () => {
 
       await runMigrations(migrations, { commitEachMigration: true });
 
+      // 1 migration commit (only migration-one has changes) + 1 version update commit = 2 total
       expect(gitCommitNoVerify).toHaveBeenCalledTimes(2);
     });
 

package/src/codemods/migrations/manager.ts

@@ -1,11 +1,7 @@
-import defaultMigrations, { MigrationMeta } from './migrations.js';
-import { flushChanges, formatFiles, installNPMDependencies } from '../utils.js';
+import defaultMigrations, { Migration } from './migrations.js';
+import { runCodemod } from '../runner.js';
 import { gte, satisfies } from 'semver';
-import { migrationsDebug, printChanges } from './utils.js';
-
 import { CURRENT_APP_VERSION } from '../../utils/utils.version.js';
-import { Context } from '../context.js';
-import type { MigrationModule } from '../types.js';
 import { gitCommitNoVerify } from '../../utils/utils.git.js';
 import { output } from '../../utils/utils.console.js';
 import { setRootConfig } from '../../utils/utils.config.js';
@@ -13,59 +9,36 @@ import { setRootConfig } from '../../utils/utils.config.js';
 export function getMigrationsToRun(
   fromVersion: string,
   toVersion: string,
-  migrations: Record<string, MigrationMeta> = defaultMigrations.migrations
-): Record<string, MigrationMeta> {
+  migrations: Migration[] = defaultMigrations
+): Migration[] {
   const semverRange = `${fromVersion} - ${toVersion}`;
 
-  const migrationsToRun = Object.entries(migrations)
+  return migrations
+    .filter((meta) => satisfies(meta.version, semverRange))
     .sort((a, b) => {
-      return gte(a[1].version, b[1].version) ? 1 : -1;
-    })
-    .reduce<Record<string, MigrationMeta>>((acc, [key, meta]) => {
-      if (satisfies(meta.version, semverRange)) {
-        acc[key] = meta;
-      }
-      return acc;
-    }, {});
-
-  return migrationsToRun;
+      return gte(a.version, b.version) ? 1 : -1;
+    });
 }
 
 type RunMigrationsOptions = {
   commitEachMigration?: boolean;
+  codemodOptions?: Record<string, any>;
 };
 
-export async function runMigrations(migrations: Record<string, MigrationMeta>, options: RunMigrationsOptions = {}) {
-  const basePath = process.cwd();
-  const migrationList = Object.entries(migrations).map(
-    ([key, migrationMeta]) => `${key} (${migrationMeta.description})`
-  );
+export async function runMigrations(migrations: Migration[], options: RunMigrationsOptions = {}) {
+  const migrationList = migrations.map((meta) => `${meta.name} (${meta.description})`);
 
   const migrationListBody = migrationList.length > 0 ? output.bulletList(migrationList) : ['No migrations to run.'];
 
   output.log({ title: 'Running the following migrations:', body: migrationListBody });
 
-  for (const [key, migration] of Object.entries(migrations)) {
-    try {
-      const context = await runMigration(migration, new Context(basePath));
-      const shouldCommit = options.commitEachMigration && context.hasChanges();
-
-      migrationsDebug(`context for "${key} (${migration.migrationScript})":`);
-      migrationsDebug('%O', context.listChanges());
-
-      await formatFiles(context);
-      flushChanges(context);
-      printChanges(context, key, migration);
+  // run migrations sequentially in version order where lowest version runs first
+  for (const migration of migrations) {
+    const context = await runCodemod(migration, options.codemodOptions);
+    const shouldCommit = options.commitEachMigration && context.hasChanges();
 
-      installNPMDependencies(context);
-
-      if (shouldCommit) {
-        await gitCommitNoVerify(`chore: run create-plugin migration - ${key} (${migration.migrationScript})`);
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        throw new Error(`Error running migration "${key} (${migration.migrationScript})": ${error.message}`);
-      }
+    if (shouldCommit) {
+      await gitCommitNoVerify(`chore: run create-plugin migration - ${migration.name} (${migration.scriptPath})`);
     }
   }
 
@@ -75,9 +48,3 @@ export async function runMigrations(migrations: Record<string, MigrationMeta>, o
     await gitCommitNoVerify(`chore: update .config/.cprc.json to version ${CURRENT_APP_VERSION}.`);
   }
 }
-
-export async function runMigration(migration: MigrationMeta, context: Context): Promise<Context> {
-  const module = (await import(migration.migrationScript)) as MigrationModule;
-
-  return module.default(context);
-}