refactor: folders, set definition stuff

src/components/SetCard.astro

@@ -1,6 +1,6 @@
 ---
 import type { IConfig } from "../scripts/config";
-import type { ICase, ISet } from "../scripts/config/set/dataFormat";
+import type { ICase, ISet } from "../scripts/config/setDefinitions/dataFormat";
 import CaseCard from "./templates/CaseCard.svelte";
 
 interface Props {
@@ -18,15 +18,16 @@ const { set, config } = Astro.props
     </div>
     <span class="text-stone-500 text-xs sm:text-sm font-light">
       {set.altNames ? 'AKA ' : ''}
-    {set.altNames?.map((altName, i) => {
-      return <span class="font-semibold text-sm sm:text-lg">{altName + (i < set.altNames!.length! - 1 ? ", " : "")}</span>
-    })}
+      {set.altNames?.map((altName: string | number, i: number) => {
+        return <span class="font-semibold text-sm sm:text-lg">{altName + (i < set.altNames!.length! - 1 ? ", " : "")}</span>
+      })}
     </span>
   </summary>
-
+  
   <div class="w-full flex flex-col gap-4 items-center">
     {
       set.children && Object.entries(set.children)?.map(([k, setOrCase]) => (
+        //@ts-ignore
         setOrCase.algs != undefined ? 
           <CaseCard client:visible caso={setOrCase as ICase} config={config}/>
         :

src/data/ZBLL/hObj.ts

@@ -1,6 +1,6 @@
 import { IConfig, createConfig } from "../../scripts/config";
 import { puzzle3x3x3 } from "../../scripts/config/puzzle/3x3";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 import yml from './h.yml'
 

src/data/ZBLL/lObj.ts

@@ -1,6 +1,6 @@
 import { IConfig, createConfig } from "../../scripts/config";
 import { puzzle3x3x3 } from "../../scripts/config/puzzle/3x3";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 import yml from './l.yml'
 

src/data/ZBLL/tObj.ts

@@ -1,6 +1,6 @@
 import { IConfig, createConfig } from "../../scripts/config";
 import { puzzle3x3x3 } from "../../scripts/config/puzzle/3x3";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 import yml from './t.yml'
 

src/data/ZBLL/uObj.ts

@@ -1,6 +1,6 @@
 import { IConfig, createConfig } from "../../scripts/config";
 import { puzzle3x3x3 } from "../../scripts/config/puzzle/3x3";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 import yml from './u.yml'
 

src/data/ZBLS/zblsObj.ts

@@ -1,6 +1,6 @@
 import { IConfig, createConfig } from "../../scripts/config";
 import { puzzle3x3x3 } from "../../scripts/config/puzzle/3x3";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 
 import yml from './zbls.yml'

src/data/output/_template.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat";
-import { useGrouping } from "../../scripts/config/set/cll";
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat";
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/cll";
 
 
 import yml from '../2x2/cll.yml' // REPLACE WITH THE SET YAML

src/data/output/cllObj.ts

@@ -1,5 +1,5 @@
-import { useGrouping } from "../../scripts/config/set/cll";
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/cll";
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
 
 
 import yml from '../userSets/cll.yml'

src/data/output/eg1Obj.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping } from "../../scripts/config/set/eg1"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/eg1"
 
 import yml from '../userSets/eg1.yml'
 const data: ICaseList = yml

src/data/output/mega4LLLObj.ts

@@ -1,6 +1,6 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping as OLL } from "../../scripts/config/set/megaOLL"
-import { useGrouping as PLL } from "../../scripts/config/set/megaPLL"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping as OLL } from "../../scripts/config/setDefinitions/setConstructors/megaOLL"
+import { useGrouping as PLL } from "../../scripts/config/setDefinitions/setConstructors/megaPLL"
 
 
 import yml from '../userSets/megaoll.yml'

src/data/output/megaollObj.ts

@@ -1,6 +1,6 @@
 
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping } from "../../scripts/config/set/megaOLL"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/megaOLL"
 
 
 import yml from '../userSets/megaoll.yml'

src/data/output/megapllObj.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping } from "../../scripts/config/set/megaPLL"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/megaPLL"
 
 
 import yml from '../userSets/megapll.yml'

src/data/output/ollObj.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from '../../scripts/config/set/dataFormat'
-import { useGrouping } from '../../scripts/config/set/oll'
+import type { IAlgset, ICaseList } from '../../scripts/config/setDefinitions/dataFormat'
+import { useGrouping } from '../../scripts/config/setDefinitions/setConstructors/oll'
 
 import yml from '../userSets/oll.yml'
 let data: ICaseList = yml

src/data/output/paritypllObj.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping } from "../../scripts/config/set/parityPLL"
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/parityPLL"
 
 
 import yml from '../userSets/paritypll.yml'

src/data/output/pllObj.ts

@@ -1,5 +1,5 @@
-import type { IAlgset, ICaseList } from "../../scripts/config/set/dataFormat"
-import { useGrouping } from "../../scripts/config/set/pll";
+import type { IAlgset, ICaseList } from "../../scripts/config/setDefinitions/dataFormat"
+import { useGrouping } from "../../scripts/config/setDefinitions/setConstructors/pll";
 
 import yml from '../userSets/pll.yml'
 const data: ICaseList = yml

src/layouts/VerticalLayout.astro

@@ -2,7 +2,7 @@
   // import SetCard from "../components/SetCard.svelte";
   import SetCard from "../components/SetCard.astro";
 import type { IConfig } from "../scripts/config";
-  import type { ISet } from "../scripts/config/set/dataFormat";
+  import type { ISet } from "../scripts/config/setDefinitions/dataFormat";
 
   interface Props {
     config: IConfig
@@ -16,7 +16,7 @@ hover:brightness-110 hover:-translate-y-[1px] transition-all select-none">Collap
 
 <div class=" relative text-3xl w-full text-center my-5">{config.name}</div>
 
-{sets.map((set) => (
+{sets.map((set: ISet) => (
   <SetCard set={set} config={config} />
 ))}
 

src/pages/[...path].astro

@@ -10,7 +10,6 @@ type Props = Omit<IPageData, 'path'>
 
 export function getStaticPaths() {
   const pages = getRoutes()
-  console.log(pages)
   return pages.map(({ path, name, data }) => {
     return {
       params: { path },

src/scripts/alg/algorithm/index.ts

@@ -1,7 +1,7 @@
 import type { XOR } from "ts-essentials"
 import type { ITriggerClass } from "../trigger"
 import type { TAlgCommon } from ".."
-import type { IAlg } from "../../config/set/dataFormat"
+import type { IAlg } from "../../config/setDefinitions/dataFormat"
 
 export interface IAlgorithmClass extends IAlg, TAlgCommon<IAlgorithmClass> {
   alg: string

src/scripts/alg/index.ts

@@ -7,7 +7,7 @@ import { getModActionsFromText, type TModifierAliases } from "./trigger/modifier
 import type { IAlgorithmClass } from "./algorithm";
 import { checkExpandible, expandAlg, mirrorAlg, notationAlg, returnAlgAsComponents } from "./algorithm/actions";
 import type { IConfig } from "../config";
-import type { IAlg } from "../config/set/dataFormat";
+import type { IAlg } from "../config/setDefinitions/dataFormat";
 
 export type TAlgCommon<T extends TAlgCommon<T>> = Pick<IConfig, "imgSource"> & {
   puzzle: twistyPuzzleType

src/scripts/config/defaults.ts

@@ -1,7 +1,7 @@
 import merge from "ts-deepmerge"
 import type { IConfig, IPuzzleGenConfig, ITwistyPlayerConfig, IVisualCubeConfig } from "."
 import type { IJustPuzzleConfig } from "./puzzle"
-import type { IJustSetConfig } from "./set"
+import type { IJustSetConfig } from "./setDefinitions"
 import { puzzle3x3x3 } from "./puzzle/3x3"
 import { Type } from "sr-puzzlegen"
 

src/scripts/config/index.ts

@@ -1,5 +1,5 @@
 
-import type { IJustSetConfig, ISetConfig } from "./set";
+import type { IJustSetConfig, ISetConfig } from "./setDefinitions";
 import type { IJustPuzzleConfig, IPuzzleConfig } from "./puzzle";
 import merge from "ts-deepmerge";
 import { DefaultConfig } from "./defaults";

src/scripts/config/navigation/constants/navigationTypes.ts

@@ -1,4 +1,4 @@
-import type { IAlgset } from "../../set/dataFormat"
+import type { IAlgset } from "../../setDefinitions/dataFormat"
 
 export interface IPageData {
   path: string,

src/scripts/config/set/cll.ts → src/scripts/config/setDefinitions/setConstructors/cll.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzle2x2x2 } from "../puzzle/2x2"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzle2x2x2 } from "../../puzzle/2x2"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/eg1.yml'
+import caseDefinitions from '../caseDefaults/eg1.yml'
 import merge from "ts-deepmerge"
 // CONFIG
 const puzzleOptions: IPuzzleConfig = puzzle2x2x2

src/scripts/config/set/eg1.ts → src/scripts/config/setDefinitions/setConstructors/eg1.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { IConfig, createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzle2x2x2 } from "../puzzle/2x2"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { IConfig, createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzle2x2x2 } from "../../puzzle/2x2"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/eg1.yml'
+import caseDefinitions from '../caseDefaults/eg1.yml'
 import merge from "ts-deepmerge"
 
 // CONFIG

src/scripts/config/set/megaOLL.ts → src/scripts/config/setDefinitions/setConstructors/megaOLL.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { IConfig, createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzleMegaminx } from "../puzzle/megaminx"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { IConfig, createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzleMegaminx } from "../../puzzle/megaminx"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/megaOLL.yml'
+import caseDefinitions from '../caseDefaults/megaOLL.yml'
 import merge from "ts-deepmerge"
 
 // CONFIG

src/scripts/config/set/megaPLL.ts → src/scripts/config/setDefinitions/setConstructors/megaPLL.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { IConfig, createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzleMegaminx } from "../puzzle/megaminx"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { IConfig, createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzleMegaminx } from "../../puzzle/megaminx"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/megaPLL.yml'
+import caseDefinitions from '../caseDefaults/megaPLL.yml'
 import merge from "ts-deepmerge"
 
 // CONFIG

src/scripts/config/set/oll.ts → src/scripts/config/setDefinitions/setConstructors/oll.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzle3x3x3 } from "../puzzle/3x3"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzle3x3x3 } from "../../puzzle/3x3"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/oll.yml'
+import caseDefinitions from '../caseDefaults/oll.yml'
 import merge from "ts-deepmerge"
 // CONFIG
 const puzzleOptions: IPuzzleConfig = puzzle3x3x3

src/scripts/config/set/parityPLL.ts → src/scripts/config/setDefinitions/setConstructors/parityPLL.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzle4x4x4 } from "../puzzle/4x4"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzle4x4x4 } from "../../puzzle/4x4"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/parityPLL.yml'
+import caseDefinitions from '../caseDefaults/parityPLL.yml'
 import merge from "ts-deepmerge"
 
 // CONFIG

src/scripts/config/set/pll.ts → src/scripts/config/setDefinitions/setConstructors/pll.ts

@@ -1,11 +1,11 @@
-import type { ISetConfig } from "."
-import { listFromData } from "."
-import { createConfig } from ".."
-import type { IPuzzleConfig } from "../puzzle"
-import { puzzle3x3x3 } from "../puzzle/3x3"
-import type { IAlgset, ICaseList } from "./dataFormat"
+import type { ISetConfig } from ".."
+import { listFromData } from ".."
+import { createConfig } from "../.."
+import type { IPuzzleConfig } from "../../puzzle"
+import { puzzle3x3x3 } from "../../puzzle/3x3"
+import type { IAlgset, ICaseList } from "../dataFormat"
 
-import caseDefinitions from './cases/pll.yml'
+import caseDefinitions from '../caseDefaults/pll.yml'
 import merge from "ts-deepmerge"
 
 // CONFIG