pob 35.5.0 → 35.7.0

package/README.md

@@ -3,7 +3,7 @@
 </h1>
 
 <p align="center">
-  Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest
+  Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest
 </p>
 
 <p align="center">
@@ -28,30 +28,11 @@ You can now use `yarn run watch` !
 
 ### How this works
 
-#### Babel
-
-Write code in the `src` directory, it's then transpiled with babel and rollup to `dist`.
-Use the task `yarn run build` or `yarn run watch` to transpile the code.
-
-There are several environments: `node`, `browser`.
-For each of these environments, there is also a `dev` version that add flow runtime checks.
-
 #### Coding Rules
 
 Eslint is used to ensure a common coding style. I mostly follow the [Airbnb coding style](https://github.com/airbnb/javascript/blob/master/README.md).
 You can check the code by running the task `yarn run lint`. With an editor, install the plugins to validate the code as you type !
 
-#### Documentation
-
-[typedoc](https://typedoc.org/) allows to document the code and generate the api.
-[jest](https://www.npmjs.com/package/jest) is used to generate the coverage.
-
-Documentation can be generated by github actions and pushed to github-pages.
-
-#### Tests
-
-Tests are in the directory `src` with jest. Use the task `yarn test` to run the tests with jest.
-
 ### Available tasks with `yarn run`
 
 #### Code, Transpile, Lint
@@ -59,7 +40,7 @@ Tests are in the directory `src` with jest. Use the task `yarn test` to run the
 - `build`: `clean` the directory, build `src` to `dist` with rollup
 - `watch`: `clean` then build and watch with rollup
 - `lint`: execute `eslint`
-- `test`: run tests with jest
+- `test`: run tests
 
 ### Generate documentation
 

package/lib/generators/common/babel/CommonBabelGenerator.js

@@ -304,6 +304,12 @@ export default class CommonBabelGenerator extends Generator {
       (env) => env.target === "browser",
     );
 
+    if (useBabel) {
+      throw new Error(
+        "pob-babel is deprecated. Use @pob/rollup-esbuild or @pob/rollup-typescript instead.",
+      );
+    }
+
     /* dependencies */
 
     if (
@@ -322,14 +328,8 @@ export default class CommonBabelGenerator extends Generator {
     }
 
     if (pkg.dependencies && pkg.dependencies["pob-babel"]) {
-      // update pob-babel in alp-dev
-      packageUtils.addDependencies(pkg, ["pob-babel"], "^");
-    }
-    if (pkg.dependencies && pkg.dependencies["@babel/runtime"]) {
-      // update pob-babel in alp-dev
-      packageUtils.addDependencies(pkg, ["@babel/runtime"], "^");
+      throw new Error("pob-babel is deprecated.");
     }
-
     const isLibraryRollupPlugin = pkg.name.includes("rollup-plugin");
 
     packageUtils.addOrRemoveDevDependencies(
@@ -441,13 +441,7 @@ export default class CommonBabelGenerator extends Generator {
     this.fs.delete(".babelrc");
     this.fs.delete("babel.config.json");
     this.fs.delete("babel.config.mjs");
-    if (this.fs.exists(this.destinationPath("babel.config.js"))) {
-      this.fs.move(
-        this.destinationPath("babel.config.js"),
-        this.destinationPath("babel.config.cjs"),
-      );
-    }
-
+    this.fs.delete("babel.config.js");
     this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }
 }

package/lib/generators/common/release/CommonReleaseGenerator.js

@@ -1,5 +1,6 @@
 import Generator from "yeoman-generator";
 // import { latestLTS } from "../../../utils/nodeVersions.js";
+import { latestLTS } from "../../../utils/nodeVersions.js";
 import * as packageUtils from "../../../utils/package.js";
 import {
   packageManagerExec,
@@ -86,7 +87,7 @@ export default class CommonReleaseGenerator extends Generator {
           isMonorepoIndependent:
             this.options.isMonorepo &&
             (!pkg.version || pkg.version === "0.0.0"),
-          nodeLatestMajorVersion: 24, // TODO use latestLTS, when latest is updated to 24
+          nodeLatestMajorVersion: latestLTS,
           packageManagerExec,
         },
       );

package/lib/generators/common/testing/CommonTestingGenerator.js

@@ -30,7 +30,7 @@ export default class CommonTestingGenerator extends Generator {
     this.option("runner", {
       type: String,
       default: "node",
-      description: "test runner (jest or node)",
+      description: "test runner (vitest or node)",
     });
 
     this.option("ci", {
@@ -157,14 +157,14 @@ export default class CommonTestingGenerator extends Generator {
       (inMonorepo && inMonorepo.pobMonorepoConfig) || {};
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const enableForMonorepo = this.options.monorepo && globalTesting;
-    const transpileWithEsbuild = packageUtils.transpileWithEsbuild(pkg);
+    const transpileWithEsbuild = false;
     const transpileWithBabel = transpileWithEsbuild
       ? false
       : // eslint-disable-next-line unicorn/no-nested-ternary
         this.options.monorepo
         ? yoConfigPobMonorepo.typescript &&
           yoConfigPobMonorepo.typescript !== "check-only"
-        : packageUtils.transpileWithBabel(pkg);
+        : false;
     const withTypescript =
       transpileWithBabel ||
       pkg.pob?.bundler === "tsc" ||
@@ -243,9 +243,7 @@ export default class CommonTestingGenerator extends Generator {
 
     const createTestCommand = ({
       coverage,
-      coverageJson,
       watch,
-
       workspacesPattern,
       hasReact,
     }) => {
@@ -259,12 +257,13 @@ export default class CommonTestingGenerator extends Generator {
           if (!workspacesPattern && this.options.monorepo) {
             throw new Error("Invalid workspacesPattern");
           }
-          const experimentalTestCoverage = false; // todo configure src directory and remove test files
+          const experimentalTestCoverage =
+            pkg.name === "check-package-dependencies";
           return `TZ=UTC ${
-            coverage || coverageJson
+            coverage && !experimentalTestCoverage
               ? `npx c8${
-                  coverageJson
-                    ? ` --reporter=${coverageJson ? "json" : "lcov"}`
+                  coverage === "generate"
+                    ? ` --reporter=${coverage === "generate" ? "json" : "lcov"}`
                     : ""
                 } --all --src ./${this.options.srcDirectory} `
               : ""
@@ -272,9 +271,9 @@ export default class CommonTestingGenerator extends Generator {
             this.options.typescript
               ? `${tsTestLoaderOption ? `${tsTestLoaderOption} ` : ""}`
               : ""
-          }${this.fs.exists("src/test-setup.ts") ? "--import ./src/test-setup.ts " : ""}--test${experimentalTestCoverage && (coverage || coverageJson) ? " --experimental-test-coverage" : ""} ${this.options.monorepo ? `${workspacesPattern}/*/` : ""}${`${
+          }${this.fs.exists("src/test-setup.ts") ? "--import ./src/test-setup.ts " : ""}--test${experimentalTestCoverage && coverage ? ` --experimental-test-coverage${coverage === "generate" ? " --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=docs/coverage.lcov" : ""} --test-coverage-include="${this.options.srcDirectory}/**/*.ts"` : ""} '${this.options.monorepo ? `${workspacesPattern}/*/` : ""}${`${
             hasTestFolder ? "test/*" : `${this.options.srcDirectory}/**/*.test`
-          }.${this.options.typescript ? "ts" : "js"}`}`;
+          }.${this.options.typescript ? "ts" : "js"}`}'`;
         }
         case "bun": {
           if (this.options.packageManager !== "bun") {
@@ -284,17 +283,17 @@ export default class CommonTestingGenerator extends Generator {
           }
 
           return `TZ=UTC bun test${watch ? " --watch" : ""}${
-            coverage || coverageJson
-              ? ` --coverage ${coverageJson ? "--coverage-report=json" : ""}`
+            coverage
+              ? ` --coverage ${coverage === "generate" ? "--coverage-report=json" : ""}`
               : ""
           }`;
         }
         case "vitest": {
           return `TZ=UTC ${
-            coverage || coverageJson
-              ? `POB_VITEST_COVERAGE=${`json${coverageJson ? "" : ",text"} `}`
+            coverage
+              ? `POB_VITEST_COVERAGE=${`json${coverage === "generate" ? "" : ",text"} `}`
               : ""
-          }vitest${watch ? " --watch" : ""}${coverage || coverageJson ? " run --coverage" : ""}`;
+          }vitest${watch ? " --watch" : ""}${coverage ? " run --coverage" : ""}`;
         }
         default: {
           throw new Error(`Invalid runner: "${testRunner}"`);
@@ -370,8 +369,12 @@ export default class CommonTestingGenerator extends Generator {
           );
         }
 
+        packageUtils.removeScripts(pkg, [
+          "test:coverage:lcov",
+          "test:coverage:json",
+        ]);
+
         if (this.options.monorepo) {
-          packageUtils.removeScripts(pkg, ["test:coverage:lcov"]);
           packageUtils.addScripts(pkg, {
             test: createTestCommand({
               workspacesPattern,
@@ -384,9 +387,9 @@ export default class CommonTestingGenerator extends Generator {
               workspacesPattern,
               coverage: true,
             }),
-            "test:coverage:json": createTestCommand({
+            "test:coverage:generate": createTestCommand({
               workspacesPattern,
-              coverageJson: true,
+              coverage: "generate",
             }),
           });
         } else {
@@ -420,8 +423,8 @@ export default class CommonTestingGenerator extends Generator {
               "test:coverage": createTestCommand({
                 coverage: true,
               }),
-              "test:coverage:json": createTestCommand({
-                coverageJson: true,
+              "test:coverage:generate": createTestCommand({
+                coverage: "generate",
               }),
             });
 

package/lib/generators/common/testing/templates/vite.config.js.ejs

@@ -6,7 +6,7 @@ export default defineConfig({
     include: ["<%= srcDirectory %>/**/__tests__/**/*.ts?(x)", "<%= srcDirectory %>/**/*.test.ts?(x)"],
     coverage: {
       include: ["<%= srcDirectory %>/**/*.ts?(x)"],
-      reportsDirectory: "docs/coverage",
+      reportsDirectory: "coverage",
       reporter: (process.env.POB_VITEST_COVERAGE || "json,text").split(","),
     },
   },

package/lib/generators/common/transpiler/CommonTranspilerGenerator.js

@@ -160,7 +160,6 @@ export default class CommonTranspilerGenerator extends Generator {
     const cleanCommand = (() => {
       if (bundler === "rollup-typescript") return "pob-typescript-clean-out";
       if (bundler === "rollup-esbuild") return "pob-esbuild-clean-out";
-      if (bundler === "rollup-babel") return "pob-babel-clean-out";
       if (bundler === "esbuild") return "pob-esbuild-clean-out";
       if (bundler === "tsc") return "rm -Rf";
       if (bundler) throw new Error(`Invalid bundler: ${bundler}`);
@@ -524,6 +523,7 @@ export default class CommonTranspilerGenerator extends Generator {
             if (extraEntryConfig.name.endsWith(".css")) {
               return {
                 style: `./${extraEntryConfig.name}`,
+                import: `./${extraEntryConfig.name}`,
                 default: `./${extraEntryConfig.name}`,
               };
             }
@@ -610,7 +610,7 @@ export default class CommonTranspilerGenerator extends Generator {
         envs.some(
           (env) =>
             env.target === "node" &&
-            (["8", "6", "10", "12", "14", "16", "18", "20"].includes(
+            (["4", "6", "8", "10", "12", "14", "16", "18", "20"].includes(
               String(env.version),
             ) ||
               (this.options.onlyLatestLTS &&
@@ -667,6 +667,9 @@ export default class CommonTranspilerGenerator extends Generator {
               : `${maintenanceLTS}`)();
 
       switch (String(minNodeVersion)) {
+        case "4":
+        case "6":
+        case "8":
         case "10":
         case "12":
         case "14":

package/lib/generators/core/ci/templates/github-action-documentation-workflow.yml.ejs

@@ -58,11 +58,11 @@ jobs:
 <% if (testRunner === 'node') { -%>
 
       - name: Generate Coverage
-        run: NODE_V8_COVERAGE=./docs/coverage <%= packageManager %> run test:coverage
+        run: NODE_V8_COVERAGE=./docs/coverage <%= packageManager %> run test:coverage:generate
 <% } else {-%>
 
       - name: Generate Coverage
-        run: <%= packageManager %> run test:coverage:json<%- testRunner === 'jest' ? " --coverageDirectory=docs/coverage/" : "" %>
+        run: <%= packageManager %> run test:coverage:generate
 <% } -%>
 <% } -%>
 

package/lib/generators/core/ci/templates/github-action-push-workflow-split.yml.ejs

@@ -203,7 +203,7 @@ jobs:
         if: matrix.node-version != <%= nodeLatestMajorVersion %>
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test:coverage:json
+        run: <%= packageManager %> run test:coverage:generate
         if: matrix.node-version == <%= nodeLatestMajorVersion %>
         env:
           CI: true

package/lib/generators/core/ci/templates/github-action-push-workflow.yml.ejs

@@ -89,7 +89,7 @@ jobs:
 <% if (codecov) { -%>
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test:coverage:json
+        run: <%= packageManager %> run test:coverage:generate
         if: startsWith(matrix.node-version, '<%= nodeLatestMajorVersion %>.')
         env:
           CI: true

package/lib/generators/core/claude/CoreClaudeGenerator.js

@@ -0,0 +1,81 @@
+import Generator from "yeoman-generator";
+import { writeAndFormatJson } from "../../../utils/writeAndFormat.js";
+
+const claudePostToolUseHook = {
+  matcher: "Edit|Write|MultiEdit",
+  hooks: [{ type: "command", command: "pob-claude-run-lint-staged" }],
+};
+
+export default class CoreClaudeGenerator extends Generator {
+  constructor(args, opts) {
+    super(args, opts);
+
+    this.option("root", {
+      type: Boolean,
+      required: false,
+      default: true,
+      description: "Root package.",
+    });
+  }
+
+  async writing() {
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"), {});
+    const claudeGitignorePath = this.destinationPath(".claude/.gitignore");
+    const claudeSettingsPath = this.destinationPath(".claude/settings.json");
+
+    if (!this.options.root) {
+      this.fs.delete(claudeGitignorePath);
+      this.fs.delete(claudeSettingsPath);
+      return;
+    }
+
+    this.fs.write(
+      claudeGitignorePath,
+      "/settings.local.json\n/skills/local.*\n",
+    );
+
+    const existing = this.fs.readJSON(claudeSettingsPath, {
+      hooks: {
+        PostToolUse: [
+          {
+            matcher: "Edit|Write|MultiEdit",
+            hooks: [
+              {
+                type: "command",
+                command:
+                  pkg.name === "pob-monorepo"
+                    ? "node ./@pob/root/bin/pob-claude-run-lint-staged.js"
+                    : "./node_modules/.bin/pob-claude-run-lint-staged",
+              },
+            ],
+          },
+        ],
+      },
+    });
+
+    // Find or create the PostToolUse hook entry for our matcher
+    const postToolUse = existing.hooks?.PostToolUse ?? [];
+
+    const existingEntry = postToolUse.find(
+      (entry) => entry.matcher === claudePostToolUseHook.matcher,
+    );
+    if (existingEntry) {
+      // Add any of our hooks not already present
+      for (const hook of claudePostToolUseHook.hooks) {
+        if (!existingEntry.hooks?.some((h) => h.command === hook.command)) {
+          (existingEntry.hooks ??= []).push(hook);
+        }
+      }
+    } else {
+      postToolUse.push(claudePostToolUseHook);
+    }
+
+    await writeAndFormatJson(this.fs, claudeSettingsPath, {
+      ...existing,
+      hooks: {
+        ...existing.hooks,
+        PostToolUse: postToolUse,
+      },
+    });
+  }
+}

package/lib/generators/core/vscode/CoreVSCodeGenerator.js

@@ -37,7 +37,7 @@ export default class CoreVSCodeGenerator extends Generator {
     this.option("testRunner", {
       type: String,
       required: false,
-      description: "Test runner (jest, vitest, ...)",
+      description: "Test runner (node, vitest, ...)",
     });
 
     this.option("yarnNodeLinker", {

package/lib/generators/core/vscode/templates/settings.json.ejs

@@ -40,12 +40,6 @@
     "source.organizeImports": "never"
   },
 
-
-<% if (testing && module && (!testRunner || testRunner === 'jest')) { -%>
-  // jest
-  "jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest",
-<% } -%>
-
   // extension eslint config
   "eslint.workingDirectories": ["."],
   "eslint.useFlatConfig": true,

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -406,12 +406,6 @@ export default class PobMonorepoGenerator extends Generator {
         build: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs`,
         watch: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs --watch`,
       });
-      packageUtils.addOrRemoveDevDependencies(
-        pkg,
-        rollupConfigs.length > 0 &&
-          (rollupKinds.size === 0 || rollupKinds.has("babel")),
-        ["@babel/core", "pob-babel"],
-      );
 
       packageUtils.addOrRemoveDevDependencies(pkg, rollupKinds.has("esbuild"), [
         "@pob/rollup-esbuild",

package/lib/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js

@@ -63,12 +63,15 @@ export default class MonorepoWorkspacesGenerator extends Generator {
   writing() {
     const getPackagePobConfig = (config) => ({
       babelEnvs: [],
+      envs: [],
       ...(config && config.pob),
     });
     const withBundler = this.packages.some((config) => {
       const pobConfig = getPackagePobConfig(config);
       return (
-        pobConfig.babelEnvs.length > 0 || pobConfig.bundler === "rollup-babel"
+        pobConfig.envs.length > 0 ||
+        pobConfig.babelEnvs.length > 0 ||
+        pobConfig.bundler === "rollup-babel"
       );
     });
 

package/lib/generators/monorepo/workspaces/templates/README.md.ejs

@@ -10,7 +10,7 @@
 
 <h3>📦 Packages</h3>
 
-This repository is a monorepo that we manage using [Yarn Workspaces](https://yarnpkg.com/features/workspaces).
+This repository is a monorepo using workspaces.
 
 | Package | Version | Description |
 |---------|---------|-------------|

package/lib/generators/pob/PobBaseGenerator.js

@@ -199,6 +199,10 @@ export default class PobBaseGenerator extends Generator {
 
     this.composeWith("pob:core:editorconfig");
 
+    this.composeWith("pob:core:claude", {
+      root: this.isRoot,
+    });
+
     this.composeWith("pob:core:clean", {
       root: this.isRoot,
     });

package/lib/pob.js

@@ -24,6 +24,7 @@ import CommonTranspilerGenerator from "./generators/common/transpiler/CommonTran
 import CommonTypescriptGenerator from "./generators/common/typescript/CommonTypescriptGenerator.js";
 import CoreBunGenerator from "./generators/core/bun/CoreBunGenerator.js";
 import CoreCIGenerator from "./generators/core/ci/CoreCIGenerator.js";
+import CoreClaudeGenerator from "./generators/core/claude/CoreClaudeGenerator.js";
 import CoreCleanGenerator from "./generators/core/clean/CoreCleanGenerator.js";
 import CoreEditorConfigGenerator from "./generators/core/editorconfig/CoreEditorConfigGenerator.js";
 import CoreGitGenerator from "./generators/core/git/CoreGitGenerator.js";
@@ -156,6 +157,11 @@ env.registerStub(
   "pob:core:editorconfig",
   `${__dirname}/generators/core/editorconfig/CoreEditorConfigGenerator.js`,
 );
+env.registerStub(
+  CoreClaudeGenerator,
+  "pob:core:claude",
+  `${__dirname}/generators/core/claude/CoreClaudeGenerator.js`,
+);
 env.registerStub(
   CoreGitGenerator,
   "pob:core:git",

package/lib/utils/package.js

@@ -16,32 +16,6 @@ export { default as parseAuthor } from "parse-author";
 export const parsePkgAuthor = (pkg) =>
   typeof pkg.author === "string" ? parseAuthor(pkg.author) : pkg.author;
 
-export const hasLerna = (pkg) =>
-  !!(pkg.devDependencies && pkg.devDependencies.lerna);
-
-export const hasBabel = (pkg) =>
-  !!(
-    pkg.devDependencies &&
-    (pkg.devDependencies["pob-babel"] || pkg.devDependencies["@babel/core"])
-  );
-
-export const transpileWithEsbuild = (pkg) =>
-  !!(pkg.devDependencies && pkg.devDependencies["jest-esbuild"]);
-
-export const transpileWithBabel = (pkg) =>
-  !!(
-    (pkg.devDependencies &&
-      (pkg.devDependencies["pob-babel"] ||
-        pkg.devDependencies.next ||
-        pkg.devDependencies["@yarnpkg/builder"] ||
-        pkg.devDependencies["alp-dev"])) ||
-    // alp-dev has pob-babel in dependencies
-    (pkg.dependencies &&
-      (pkg.dependencies["pob-babel"] ||
-        pkg.dependencies.next ||
-        pkg.dependencies["alp-dev"]))
-  );
-
 export const hasReact = (pkg) =>
   !!(
     (pkg.dependencies && pkg.dependencies.react) ||

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pob",
-  "version": "35.5.0",
-  "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
+  "version": "35.7.0",
+  "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
   ],
@@ -28,12 +28,12 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@pob/eslint-config": "65.5.0",
-    "@pob/eslint-config-typescript-react": "65.5.0",
-    "@types/inquirer": "9.0.9",
+    "@pob/eslint-config": "65.6.0",
+    "@pob/eslint-config-typescript-react": "65.6.0",
+    "@types/inquirer": "9.0.10",
     "@yeoman/adapter": "4.0.2",
     "@yeoman/types": "1.11.1",
-    "eslint": "10.4.0",
+    "eslint": "10.7.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^9.0.0",
@@ -41,7 +41,7 @@
     "json5": "^2.2.3",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
-    "mem-fs": "4.1.4",
+    "mem-fs": "4.1.5",
     "mem-fs-editor": "12.0.4",
     "minimist": "1.2.8",
     "oxfmt": "0.54.0",
@@ -52,12 +52,12 @@
     "yeoman-environment": "6.1.0",
     "yeoman-generator": "8.2.2",
     "@pob/sort-object": "11.1.1",
-    "pob-dependencies": "24.2.0",
-    "@pob/sort-pkg": "13.1.1"
+    "pob-dependencies": "24.4.0",
+    "@pob/sort-pkg": "13.1.2"
   },
   "devDependencies": {
-    "@types/node": "24.12.4",
-    "@pob/root": "24.5.0"
+    "@types/node": "24.13.3",
+    "@pob/root": "24.7.0"
   },
   "engines": {
     "node": ">=22.18.0"

package/lib/generators/common/testing/templates/babel.config.cjs.ejs

@@ -1,26 +0,0 @@
-'use strict';
-
-module.exports = function babelConfig(api) {
-  const isTest = api.env('test');
-
-  if (!isTest) return {};
-
-  return {
-    only: [<%- only %>],
-    presets: [
-      ['pob-babel/preset.js', { modules: <%- jestExperimentalESM ? 'false' : "'commonjs'" %> }]
-      <% if (hasReact) { %>, [
-        '@babel/preset-react',
-        {
-          runtime: 'automatic',
-          development: false,
-          useBuiltIns: true,
-          useSpread: true,
-        },
-      ]<% } %>
-      <% if (hasLinaria) { %>, [
-        '@linaria/babel-preset'
-      ]<% } %>
-    ],
-  };
-};